Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Brecht Van Lommel
2013-11-28 17:59:55 +01:00
parent 764204baf2
commit 683093b5c8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -876,7 +876,7 @@ if(UNIX AND NOT APPLE)
endif() endif()
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed # 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)) if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
find_package(X11 REQUIRED) find_package(X11 REQUIRED)

2
build_files/scons/config/linux-config.py
View File

@@ -247,7 +247,7 @@ C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-par
CC_WARN = ['-Wall'] CC_WARN = ['-Wall']
CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] 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 = False
BF_PROFILE_CCFLAGS = ['-pg','-g'] BF_PROFILE_CCFLAGS = ['-pg','-g']