--- build/build-clang/build-clang.py.orig
+++ build/build-clang/build-clang.py
@@ -503,9 +503,9 @@
 
     if is_darwin():
         extra_cflags = []
-        extra_cxxflags = ["-stdlib=libc++"]
+        extra_cxxflags = []
         extra_cflags2 = []
-        extra_cxxflags2 = ["-stdlib=libc++"]
+        extra_cxxflags2 = []
         extra_asmflags = []
         extra_ldflags = []
     elif is_linux():
--- build/clang-plugin/moz.build.orig
+++ build/clang-plugin/moz.build
@@ -62,8 +62,8 @@
 
 # libc++ is required to build plugins against clang on OS X.
 if CONFIG['HOST_OS_ARCH'] == 'Darwin':
-    CXXFLAGS += ['-stdlib=libc++']
-    LDFLAGS += ['-lc++']
+    CXXFLAGS += []
+    LDFLAGS += []
 
 DIRS += [
     'tests',
--- js/src/old-configure.in.orig
+++ js/src/old-configure.in
@@ -565,7 +565,7 @@
 *-darwin*)
     MOZ_OPTIMIZE_FLAGS="-O3 -fno-stack-protector"
     CFLAGS="$CFLAGS -fno-common"
-    CXXFLAGS="$CXXFLAGS -fno-common -stdlib=libc++"
+    CXXFLAGS="$CXXFLAGS -fno-common"
     DSO_LDOPTS=''
     STRIP="$STRIP -x -S"
     LDFLAGS="$LDFLAGS -lobjc"
--- js/src/old-configure.orig
+++ js/src/old-configure
@@ -4939,7 +4939,7 @@
 *-darwin*)
     MOZ_OPTIMIZE_FLAGS="-O3 -fno-stack-protector"
     CFLAGS="$CFLAGS -fno-common"
-    CXXFLAGS="$CXXFLAGS -fno-common -stdlib=libc++"
+    CXXFLAGS="$CXXFLAGS -fno-common"
     DSO_LDOPTS=''
     STRIP="$STRIP -x -S"
     LDFLAGS="$LDFLAGS -lobjc"
