--- a/make/bsd/makefiles/gcc.make	Thu Mar 20 22:30:26 2014 +0100
+++ b/make/bsd/makefiles/gcc.make	Tue Mar 18 20:19:10 2014 -0700
@@ -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")