[Bf-blender-cvs] [014c7fc] soc-2013-paint: SCons: Hopefully final fix for 32bit linux buildbot
Sergey Sharybin
noreply at git.blender.org
Sat Jul 12 12:44:42 CEST 2014
Commit: 014c7fc0109776fd53d7b40576c89cf3db8bfcd0
Author: Sergey Sharybin
Date: Thu Jul 10 10:47:01 2014 +0600
https://developer.blender.org/rB014c7fc0109776fd53d7b40576c89cf3db8bfcd0
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 0d66cfd..23dc67d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -779,16 +779,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