Browse Source

Do not require OpenMP for non-tools builds (export templates)

Rémi Verschelde 7 years ago
parent
commit
bf4d398d4e
3 changed files with 4 additions and 4 deletions
  1. 1 1
      platform/osx/detect.py
  2. 2 2
      platform/windows/detect.py
  3. 1 1
      platform/x11/detect.py

+ 1 - 1
platform/osx/detect.py

@@ -82,7 +82,7 @@ def configure(env):
             env['RANLIB'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ranlib"
             env['AS'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-as"
             env.Append(CCFLAGS=['-D__MACPORTS__']) #hack to fix libvpx MM256_BROADCASTSI128_SI256 define
-            if (env["openmp"]):
+            if env['tools'] and env['openmp']:
                 env.Append(CPPFLAGS=['-fopenmp'])
                 env.Append(LINKFLAGS=['-fopenmp'])
 

+ 2 - 2
platform/windows/detect.py

@@ -191,7 +191,7 @@ def configure(env):
         if (env["use_lto"]):
             env.Append(CCFLAGS=['/GL'])
             env.Append(LINKFLAGS=['/LTCG'])
-        if (env["openmp"]):
+        if env['tools'] and env['openmp']:
             env.Append(CPPFLAGS=['/openmp'])
 
         env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
@@ -270,7 +270,7 @@ def configure(env):
             env.Append(CCFLAGS=['-flto'])
             env.Append(LINKFLAGS=['-flto=' + str(env.GetOption("num_jobs"))])
 
-        if (env["openmp"]):
+        if env['tools'] and env['openmp']:
             env.Append(CPPFLAGS=['-fopenmp'])
             env.Append(LINKFLAGS=['-fopenmp'])
 

+ 1 - 1
platform/x11/detect.py

@@ -265,7 +265,7 @@ def configure(env):
         env.Append(LINKFLAGS=['-m64', '-L/usr/lib/i686-linux-gnu'])
 
 
-    if env["openmp"]:
+    if env['tools'] and env['openmp']:
         env.Append(CPPFLAGS=['-fopenmp'])
         env.Append(LINKFLAGS=['-fopenmp'])