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:
authorBastien Montagne <montagne29@wanadoo.fr>2014-05-03 13:08:27 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-05-03 13:08:27 +0400
commitc7612d68b2bcf71d39f683059811f61c15a6d4b1 (patch)
tree14d360cf3488a3dd3dc242bcad6c3da435f46500 /intern/cycles/SConscript
parent392d5de0aa2f901892b651ad37e44b1d289cf344 (diff)
Comment out scons '-Werror=float-conversion' for Cycles for now.
This option is only available in gcc >= 4.9, and we do not have a fancy helper in scons to check availability of a flag...
Diffstat (limited to 'intern/cycles/SConscript')
-rw-r--r--intern/cycles/SConscript6
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 893ad09c46b..532238b9d7e 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -73,8 +73,10 @@ else:
cxxflags.append('-ffast-math'.split())
# Warnings
-if env['C_COMPILER_ID'] == 'gcc':
- cxxflags.append(['-Werror=float-conversion'])
+# XXX Not supported by gcc < 4.9, since we do not have any 'supported flags' test as in cmake,
+# simpler to comment for now.
+#if env['C_COMPILER_ID'] == 'gcc':
+# cxxflags.append(['-Werror=float-conversion'])
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs.append(env['BF_PTHREADS_INC'])