[Bf-blender-cvs] [61170eb] ui-preview-buttons: Use gnu89 for GCC

Campbell Barton noreply at git.blender.org
Tue Apr 28 19:12:54 CEST 2015


Commit: 61170eb2325d13b6e55717ceb59487c540809156
Author: Campbell Barton
Date:   Tue Apr 28 18:37:28 2015 +1000
Branches: ui-preview-buttons
https://developer.blender.org/rB61170eb2325d13b6e55717ceb59487c540809156

Use gnu89 for GCC

GCC5 defaults to gnu11, which we may switch to later
but disable for now to prevent accidental use.

===================================================================

M	CMakeLists.txt
M	build_files/scons/config/linux-config.py

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdaefb0..4724e10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1156,6 +1156,12 @@ if(UNIX AND NOT APPLE)
 	# GNU Compiler
 	if(CMAKE_COMPILER_IS_GNUCC)
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+
+		if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "5.0")
+			# GCC5 uses gnu11, until we update, force c89
+			# though some c11 features can still be used.
+			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu89")
+		endif()
 	# CLang is the same as GCC for now.
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py
index 455dd23..c3f0c43 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -230,7 +230,7 @@ WITH_BF_FREESTYLE = True
 CC = 'gcc'
 CXX = 'g++'
 
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing', '-std=gnu89', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
 CXXFLAGS = []
 
 CPPFLAGS = []




More information about the Bf-blender-cvs mailing list