scons: ubuntu is a endless source of weirdness

sahib · Jan 11, 2015 · baed058 · baed058
1 parent 0dbbb1c
commit baed058
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,4 +11,4 @@ notifications:
     - [email protected]
     - [email protected]
 
-script: scons && export USE_VALGRIND=1 && sudo nosetests3
+script: scons VERBOSE=1 && scons config && export USE_VALGRIND=1 && sudo nosetests3
diff --git a/SConstruct b/SConstruct
@@ -479,14 +479,14 @@ if 'LDFLAGS' in os.environ:
 
 # Support museums or other debian flavours:
 conf.check_c11()
-if conf.env['HAVE_C11']:
+if conf.env['HAVE_C11'] and 0:
     c_standard = ['-std=c11']
 else:
     c_standard = ['-std=c99', '-fms-extensions']
 
-
+conf.env.Append(CCFLAGS=c_standard)
 conf.env.Append(CCFLAGS=[
-    c_standard, '-pipe', '-fPIC', '-D_GNU_SOURCE'
+    '-pipe', '-fPIC', '-D_GNU_SOURCE'
 ])
 
 if ARGUMENTS.get('DEBUG') == "1":