Ticket #48759: openmp-locations.patch

tools/clang/lib/Driver/Tools.cpp

@@ -4064 +4064 @@
     case OMPRT_OMP:
     case OMPRT_IOMP5:
       // Clang can generate useful OpenMP code for these two runtime libraries.
+      // Automatically find MacPorts' omp.h
+      CmdArgs.push_back("-I@@PREFIX@@/include/libomp");
       CmdArgs.push_back("-fopenmp");
 
       // If no option regarding the use of TLS in OpenMP codegeneration is
@@ -6531 +6533 @@
                    options::OPT_fno_openmp, false)) {
     switch (getOpenMPRuntime(getToolChain(), Args)) {
     case OMPRT_OMP:
+      // Automatically find MacPorts' libomp
+      CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
       CmdArgs.push_back("-lomp");
       break;
     case OMPRT_GOMP:
+      // Automatically find MacPorts' libgomp (libomp)
+      CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
       CmdArgs.push_back("-lgomp");
       break;
     case OMPRT_IOMP5:
+      // Automatically find MacPorts' libiomp5 (libomp)
+      CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
       CmdArgs.push_back("-liomp5");
       break;
     case OMPRT_Unknown:
@@ -8248 +8256 @@
         // Also link the particular OpenMP runtimes.
         switch (getOpenMPRuntime(ToolChain, Args)) {
         case OMPRT_OMP:
+          // Automatically find MacPorts' libomp
+          CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
           CmdArgs.push_back("-lomp");
           break;
         case OMPRT_GOMP:
+          // Automatically find MacPorts' libgomp (libomp)
+          CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
           CmdArgs.push_back("-lgomp");
 
           // FIXME: Exclude this for platforms with libgomp that don't require
@@ -8258 +8270 @@
           CmdArgs.push_back("-lrt");
           break;
         case OMPRT_IOMP5:
+          // Automatically find MacPorts' libiomp5 (libomp)
+          CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
           CmdArgs.push_back("-liomp5");
           break;
         case OMPRT_Unknown: