Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-07-10 08:47:01 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-07-10 08:48:31 +0400
commit430efd4228d3c4e7884947bc1d3d79bc8c0f2d39 (patch)
treebfb2422cccaacbd422c228ded65cb87af7417737
parent3a9e588d1a4e5ec4a9d2acd2d9f244c24a38c64f (diff)
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.
-rw-r--r--SConstruct17
1 files changed, 9 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct
index 8e310c68c90..f4e9e19d8a3 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