diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-13 08:37:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-13 08:37:33 +0100 |
| commit | 88a3e1598173a5d90a65b960b721a66972281796 (patch) | |
| tree | 52769e2b0223650ae53dacc4b8a55f23f185e9e0 | |
| parent | 729af16aa996ce0a15d27a0aff947e104e632efa (diff) | |
| parent | 26a162167822cb6409414071f7857a49d2d64653 (diff) | |
Merge pull request #14587 from hoelzl/pr-no-std-arg-on-msvc
Don't pass -std=gnu++11 to MSVC
| -rw-r--r-- | modules/etc/SCsub | 3 | ||||
| -rw-r--r-- | modules/thekla_unwrap/SCsub | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/etc/SCsub b/modules/etc/SCsub index 9c3e703f11..31d8f00ef3 100644 --- a/modules/etc/SCsub +++ b/modules/etc/SCsub @@ -34,7 +34,8 @@ env_etc.Append(CPPPATH=[thirdparty_dir]) env_etc.add_source_files(env.modules_sources, "*.cpp") # upstream uses c++11 -env_etc.Append(CCFLAGS="-std=gnu++11") +if (not env_etc.msvc): + env_etc.Append(CCFLAGS="-std=c++11") # -ffast-math seems to be incompatible with ec2comp on recent versions of # GCC and Clang if '-ffast-math' in env_etc['CCFLAGS']: diff --git a/modules/thekla_unwrap/SCsub b/modules/thekla_unwrap/SCsub index a56fc0ad4f..b489fcc9e7 100644 --- a/modules/thekla_unwrap/SCsub +++ b/modules/thekla_unwrap/SCsub @@ -56,7 +56,8 @@ if env['builtin_thekla_atlas']: env_thekla_unwrap.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/poshlib", thirdparty_dir + "/nvcore", thirdparty_dir + "/nvmesh"]) # upstream uses c++11 - env_thekla_unwrap.Append(CXXFLAGS="-std=gnu++11") + if (not env_thekla_unwrap.msvc): + env_thekla_unwrap.Append(CXXFLAGS="-std=c++11") if env["platform"] == 'x11': env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX", "-DPOSH_COMPILER_GCC"]) |