[Bf-blender-cvs] [683093b] master: CMake/Scons Build: disable explicit linking to libstdc++ on Linux/Unix.

Brecht Van Lommel noreply at git.blender.org
Thu Nov 28 18:08:34 CET 2013


Commit: 683093b5c8df391eac957cfe0c76c33d46c3503e
Author: Brecht Van Lommel
Date:   Thu Nov 28 17:59:55 2013 +0100
http://developer.blender.org/rB683093b5c8df391eac957cfe0c76c33d46c3503e

CMake/Scons Build: disable explicit linking to libstdc++ on Linux/Unix.

It's not needed, this should happen automatically already, and if you build
against libc++ instead (as on recent FreeBSD), this would give build errors.

Ref T37477.

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

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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cd4dee..6767fb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -876,7 +876,7 @@ if(UNIX AND NOT APPLE)
 	endif()
 
 	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
-	set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
+	set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread")
 
 	if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
 		find_package(X11 REQUIRED)
diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py
index 743131a..ce2d07f 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -247,7 +247,7 @@ C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-par
 CC_WARN = ['-Wall']
 CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
 
-LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
+LLIBS = ['util', 'c', 'm', 'dl', 'pthread']
 
 BF_PROFILE = False
 BF_PROFILE_CCFLAGS = ['-pg','-g']




More information about the Bf-blender-cvs mailing list