Skip to content

Commit dca2667

Browse files
Delegate the extra libc++ include overrides etc to configure/the user.
1 parent eae82da commit dca2667

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

mk/rustllvm.mk

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,6 @@ RUSTLLVM_OBJS_OBJS_$(1) := $$(RUSTLLVM_OBJS_CS_$(1):rustllvm/%.cpp=$(1)/rustllvm
3636
# handling flag with the `EHsc` argument here as well.
3737
ifeq ($$(findstring msvc,$(1)),msvc)
3838
EXTRA_RUSTLLVM_CXXFLAGS_$(1) := //EHsc
39-
else
40-
41-
ifneq ($(filter-out le32-unknown-nacl,$(CFG_TARGET)),$(CFG_TARGET))
42-
43-
ifneq ($(CFG_LLVM_ROOT),)
44-
# The toolchain's LLVM is built against a version of libc++ that might be
45-
# different than the host libc++:
46-
EXTRA_RUSTLLVM_CXXFLAGS_$(1) := -DENABLE_PNACL=1 -nostdinc++ -isystem $$(CFG_PNACL_TOOLCHAIN)/include/c++/v1
47-
else
48-
EXTRA_RUSTLLVM_CXXFLAGS_$(1) := -DENABLE_PNACL=0
49-
endif
50-
51-
else
52-
EXTRA_RUSTLLVM_CXXFLAGS_$(1) := -DENABLE_PNACL=0
53-
endif
54-
5539
endif
5640

5741
$$(RT_OUTPUT_DIR_$(1))/$$(call CFG_STATIC_LIB_NAME_$(1),rustllvm): \

0 commit comments

Comments
 (0)