changeset 14514:2328dac1da27

Merge
author amurillo
date Fri, 28 Feb 2014 09:30:20 -0800
parents 2dd7abe7b841 (diff) 16c705d792be (current diff)
children 3812c088b945 ef7328717719 3c6ae9109a86 9c9f4dac029b
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/bsd/makefiles/gcc.make	Fri Feb 28 08:02:20 2014 -0800
+++ b/make/bsd/makefiles/gcc.make	Fri Feb 28 09:30:20 2014 -0800
@@ -364,6 +364,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")