[Bf-blender-cvs] [f693e2c6441] master: Build environment: Fix for C placement independent code

Sergey Sharybin noreply at git.blender.org
Mon Aug 27 15:49:39 CEST 2018


Commit: f693e2c64412e5214c85fcd6021b4329f0c2f034
Author: Sergey Sharybin
Date:   Mon Aug 27 15:45:18 2018 +0200
Branches: master
https://developer.blender.org/rBf693e2c64412e5214c85fcd6021b4329f0c2f034

Build environment: Fix for C placement independent code

Need to pass -fPIC to C code as well.
Without this blosc is not being properly placement independent.

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

M	build_files/build_environment/cmake/options.cmake

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

diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 3e02d43ec90..7bf971208ae 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -147,13 +147,13 @@ else()
 	endif()
 
 	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
 	else()
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g ${PLATFORM_CFLAGS}")
 	endif()
-	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
-	set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
-	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
+	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CFLAGS}")
 
 	if(WITH_OPTIMIZED_DEBUG)
 		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")



More information about the Bf-blender-cvs mailing list