Skip to content

Commit 8524a52

Browse files
committed
let clang build llvm, fix rustllvm linking error
1 parent 4d096a8 commit 8524a52

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

configure

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -536,14 +536,25 @@ do
536536
# Disable unused LLVM features
537537
LLVM_OPTS="$LLVM_DBG_OPTS --disable-docs --disable-jit --enable-bindings=none --disable-threads --disable-pthreads"
538538

539-
LLVM_CXX_32="g++ -m32"
540-
LLVM_CC_32="gcc -m32"
539+
if [ "$CFG_C_COMPILER" = "clang" ]
540+
then
541+
LLVM_CXX_32="clang++ -m32"
542+
LLVM_CC_32="clang -m32"
543+
544+
LLVM_CXX_64="clang++"
545+
LLVM_CC_64="clang"
546+
else
547+
LLVM_CXX_32="g++ -m32"
548+
LLVM_CC_32="gcc -m32"
549+
550+
LLVM_CXX_64="g++"
551+
LLVM_CC_64="gcc"
552+
fi
553+
541554
LLVM_CFLAGS_32="-m32"
542555
LLVM_CXXFLAGS_32="-m32"
543556
LLVM_LDFLAGS_32="-m32"
544557

545-
LLVM_CXX_64="g++"
546-
LLVM_CC_64="gcc"
547558
LLVM_CFLAGS_64=""
548559
LLVM_CXXFLAGS_64=""
549560
LLVM_LDFLAGS_64=""

mk/rustllvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ rustllvm/$(1)/$(CFG_RUSTLLVM): $$(RUSTLLVM_OBJS_OBJS_$(1)) \
3737

3838
rustllvm/$(1)/%.o: rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
3939
@$$(call E, compile: $$@)
40-
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(LLVM_CXXFLAGS_$(1)) $$(RUSTLLVM_INCS_$(1))) $$<
40+
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(subst -I, -iquote , $$(LLVM_CXXFLAGS_$(1))) $$(RUSTLLVM_INCS_$(1))) $$<
4141
endef
4242

4343
# Instantiate template for all stages

0 commit comments

Comments
 (0)