From 683093b5c8df391eac957cfe0c76c33d46c3503e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 28 Nov 2013 17:59:55 +0100 Subject: [PATCH] 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. --- CMakeLists.txt | 2 +- build_files/scons/config/linux-config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cd4dee2a9e..6767fb92277 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 743131ab32e..ce2d07f782c 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']