Merge pull request #38430 from CleverRaven/makefile-use_libcxx

Allow using different standard library through USE_LIBCXX
CleverRaven · Feb 28, 2020 · 23fbf18 · 23fbf18
2 parents d9dbfbe + 9c4749b
commit 23fbf18
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -219,6 +219,12 @@ ifneq ($(findstring BSD,$(OS)),)
   BSD = 1
 endif
 
+# Which standard library to use (e.g. libstdc++ or libc++)
+ifdef USE_LIBCXX
+  OTHERS += -stdlib=$(USE_LIBCXX)
+  LDFLAGS += -stdlib=$(USE_LIBCXX)
+endif
+
 # This sets CXX and so must be up here
 ifdef CLANG
   # Allow setting specific CLANG version
@@ -227,13 +233,6 @@ ifdef CLANG
   else
     CLANGCMD = $(CLANG)
   endif
-  ifeq ($(NATIVE), osx)
-    USE_LIBCXX = 1
-  endif
-  ifdef USE_LIBCXX
-    OTHERS += -stdlib=libc++
-    LDFLAGS += -stdlib=libc++
-  endif
   ifdef CCACHE
     CXX = CCACHE_CPP2=1 ccache $(CROSS)$(CLANGCMD)
     LD  = CCACHE_CPP2=1 ccache $(CROSS)$(CLANGCMD)