summaryrefslogtreecommitdiff
path: root/modules/thekla_unwrap
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2017-12-08 16:18:36 +0100
committerHein-Pieter van Braam <hp@tmm.cx>2017-12-08 16:18:36 +0100
commita97446462981f00313a2f40486bbf21f67f1d174 (patch)
tree65f1027ef5162177b6f11a38b58c440098456d9b /modules/thekla_unwrap
parent372b79b0d324b1eeb5991eb510726420c7cbb12d (diff)
Fix thekla_atlas build
clang doesn't like c++ versions being supplied to build c source files.
Diffstat (limited to 'modules/thekla_unwrap')
-rw-r--r--modules/thekla_unwrap/SCsub2
-rw-r--r--modules/thekla_unwrap/config.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/thekla_unwrap/SCsub b/modules/thekla_unwrap/SCsub
index c0dd376e8c..2b1349a15f 100644
--- a/modules/thekla_unwrap/SCsub
+++ b/modules/thekla_unwrap/SCsub
@@ -55,7 +55,7 @@ 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(CCFLAGS="-std=gnu++11")
+ env_thekla_unwrap.Append(CXXFLAGS="-std=gnu++11")
if env["platform"] == 'x11':
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX"])
diff --git a/modules/thekla_unwrap/config.py b/modules/thekla_unwrap/config.py
index 7c5ecd1581..b1ce7d4b91 100644
--- a/modules/thekla_unwrap/config.py
+++ b/modules/thekla_unwrap/config.py
@@ -3,5 +3,5 @@ def can_build(platform):
def configure(env):
if not env['tools']:
- env['module_thekla_unwrap_enabled'] = False
+ env['builtin_thekla_atlas'] = False
env.disabled_modules.append("thekla_unwrap")