Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Allow using different standard library through USE_LIBCXX" #38432

Merged
merged 1 commit into from
Feb 28, 2020
Merged

Revert "Allow using different standard library through USE_LIBCXX" #38432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,6 @@ 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
Expand All @@ -233,6 +227,13 @@ 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)
Expand Down