[Bf-blender-cvs] [430efd4] master: SCons: Hopefully final fix for 32bit linux buildbot
Sergey Sharybin
noreply at git.blender.org
Thu Jul 10 06:48:38 CEST 2014
Commit: 430efd4228d3c4e7884947bc1d3d79bc8c0f2d39
Author: Sergey Sharybin
Date: Thu Jul 10 10:47:01 2014 +0600
https://developer.blender.org/rB430efd4228d3c4e7884947bc1d3d79bc8c0f2d39
SCons: Hopefully final fix for 32bit linux buildbot
No need to run automated tests for cudakernels target. TThis could
be harmless because CUDA binaries are built in the another chroot.
===================================================================
M SConstruct
===================================================================
diff --git a/SConstruct b/SConstruct
index 8e310c6..f4e9e19 100644
--- a/SConstruct
+++ b/SConstruct
@@ -777,16 +777,17 @@ B.init_lib_dict()
##### END SETUP ##########
-# Put all auto configuration run-time tests here
+if B.targets != ['cudakernels']:
+ # Put all auto configuration run-time tests here
-from FindSharedPtr import FindSharedPtr
-from FindUnorderedMap import FindUnorderedMap
+ from FindSharedPtr import FindSharedPtr
+ from FindUnorderedMap import FindUnorderedMap
-conf = Configure(env)
-conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
-FindSharedPtr(conf)
-FindUnorderedMap(conf)
-env = conf.Finish()
+ conf = Configure(env)
+ conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
+ FindSharedPtr(conf)
+ FindUnorderedMap(conf)
+ env = conf.Finish()
# End of auto configuration
More information about the Bf-blender-cvs
mailing list