Mercurial > hg > truffle
diff make/bsd/makefiles/gcc.make @ 14716:03704aa6e71b
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Fri, 21 Mar 2014 13:54:43 +0100 |
parents | b51e29501f30 |
children | 92aa6797d639 |
line wrap: on
line diff
--- a/make/bsd/makefiles/gcc.make Fri Mar 21 13:54:08 2014 +0100 +++ b/make/bsd/makefiles/gcc.make Fri Mar 21 13:54:43 2014 +0100 @@ -332,14 +332,6 @@ endif endif -# We want to use libc++ on Clang 5.0 -ifeq ($(USE_CLANG), true) - # Clang 5.0 - ifeq ($(shell expr $(CC_VER_MAJOR) = 5 \& \( $(CC_VER_MINOR) = 0 \| $(CC_VER_MINOR) = 1 \) ), 1) - CFLAGS += -stdlib=libc++ - endif -endif - # Flags for generating make dependency flags. DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) ifeq ($(USE_CLANG),) @@ -380,6 +372,11 @@ # statically link libstdc++.so, work with gcc but ignored by g++ STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic +# Ensure use libstdc++ on clang, not libc++ +ifeq ($(USE_CLANG), true) + LFLAGS += -stdlib=libstdc++ +endif + ifeq ($(USE_CLANG),) # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x. ifneq ("${CC_VER_MAJOR}", "2")