From a97446462981f00313a2f40486bbf21f67f1d174 Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Fri, 8 Dec 2017 16:18:36 +0100 Subject: [PATCH] Fix thekla_atlas build clang doesn't like c++ versions being supplied to build c source files. --- modules/thekla_unwrap/SCsub | 2 +- modules/thekla_unwrap/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/thekla_unwrap/SCsub b/modules/thekla_unwrap/SCsub index c0dd376e8c2..2b1349a15fe 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 7c5ecd15819..b1ce7d4b918 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")