Auto merge of #29233 - angelsl:msvc1, r=alexcrichton
Build compiler-rt/builtins with MSVC. r? @alexcrichton
This commit is contained in:
commit
e3f6a5606e
|
@ -1498,25 +1498,9 @@ do
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -ne 0 ]
|
# We need the generator later on for compiler-rt even if LLVM's not built
|
||||||
|
if [ ${is_msvc} -ne 0 ]
|
||||||
then
|
then
|
||||||
msg "configuring LLVM for $t with cmake"
|
|
||||||
|
|
||||||
CMAKE_ARGS="-DLLVM_INCLUDE_TESTS=OFF"
|
|
||||||
if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]; then
|
|
||||||
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug"
|
|
||||||
else
|
|
||||||
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release"
|
|
||||||
fi
|
|
||||||
if [ -z "$CFG_ENABLE_LLVM_ASSERTIONS" ]
|
|
||||||
then
|
|
||||||
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_ASSERTIONS=OFF"
|
|
||||||
else
|
|
||||||
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_ASSERTIONS=ON"
|
|
||||||
fi
|
|
||||||
|
|
||||||
msg "configuring LLVM with:"
|
|
||||||
msg "$CMAKE_ARGS"
|
|
||||||
case "$CFG_MSVC_ROOT" in
|
case "$CFG_MSVC_ROOT" in
|
||||||
*14.0*)
|
*14.0*)
|
||||||
generator="Visual Studio 14 2015"
|
generator="Visual Studio 14 2015"
|
||||||
|
@ -1538,8 +1522,32 @@ do
|
||||||
err "can only build LLVM for x86 platforms"
|
err "can only build LLVM for x86 platforms"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
CFG_CMAKE_GENERATOR=$generator
|
||||||
|
putvar CFG_CMAKE_GENERATOR
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -ne 0 ]
|
||||||
|
then
|
||||||
|
msg "configuring LLVM for $t with cmake"
|
||||||
|
|
||||||
|
CMAKE_ARGS="-DLLVM_INCLUDE_TESTS=OFF"
|
||||||
|
if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]; then
|
||||||
|
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug"
|
||||||
|
else
|
||||||
|
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release"
|
||||||
|
fi
|
||||||
|
if [ -z "$CFG_ENABLE_LLVM_ASSERTIONS" ]
|
||||||
|
then
|
||||||
|
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_ASSERTIONS=OFF"
|
||||||
|
else
|
||||||
|
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_ASSERTIONS=ON"
|
||||||
|
fi
|
||||||
|
|
||||||
|
msg "configuring LLVM with:"
|
||||||
|
msg "$CMAKE_ARGS"
|
||||||
|
|
||||||
(cd $LLVM_BUILD_DIR && "$CFG_CMAKE" $CFG_LLVM_SRC_DIR \
|
(cd $LLVM_BUILD_DIR && "$CFG_CMAKE" $CFG_LLVM_SRC_DIR \
|
||||||
-G "$generator" \
|
-G "$CFG_CMAKE_GENERATOR" \
|
||||||
$CMAKE_ARGS)
|
$CMAKE_ARGS)
|
||||||
need_ok "LLVM cmake configure failed"
|
need_ok "LLVM cmake configure failed"
|
||||||
fi
|
fi
|
||||||
|
|
39
mk/rt.mk
39
mk/rt.mk
|
@ -216,22 +216,31 @@ COMPRT_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),compiler-rt)
|
||||||
COMPRT_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(COMPRT_NAME_$(1))
|
COMPRT_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(COMPRT_NAME_$(1))
|
||||||
COMPRT_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/compiler-rt
|
COMPRT_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/compiler-rt
|
||||||
|
|
||||||
# Note that on MSVC-targeting builds we hardwire CC/AR to gcc/ar even though
|
ifeq ($$(findstring msvc,$(1)),msvc)
|
||||||
# we're targeting MSVC. This is because although compiler-rt has a CMake build
|
$$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
|
||||||
# config I can't actually figure out how to use it, so I'm not sure how to use
|
@$$(call E, cmake: compiler-rt)
|
||||||
# cl.exe to build the objects. Additionally, the compiler-rt library when built
|
$$(Q)cd "$$(COMPRT_BUILD_DIR_$(1))"; $$(CFG_CMAKE) "$(S)src/compiler-rt" \
|
||||||
# with gcc has the same ABI as cl.exe, so they're largely compatible
|
-DCMAKE_BUILD_TYPE=$$(LLVM_BUILD_CONFIG_MODE) \
|
||||||
|
-DLLVM_CONFIG_PATH=$$(LLVM_CONFIG_$(1)) \
|
||||||
|
-G"$$(CFG_CMAKE_GENERATOR)"
|
||||||
|
$$(Q)$$(CFG_CMAKE) --build "$$(COMPRT_BUILD_DIR_$(1))" \
|
||||||
|
--target lib/builtins/builtins \
|
||||||
|
--config $$(LLVM_BUILD_CONFIG_MODE) \
|
||||||
|
-- //v:m //nologo
|
||||||
|
$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/lib/windows/$$(LLVM_BUILD_CONFIG_MODE)/clang_rt.builtins-$$(HOST_$(1)).lib $$@
|
||||||
|
else
|
||||||
COMPRT_CC_$(1) := $$(CC_$(1))
|
COMPRT_CC_$(1) := $$(CC_$(1))
|
||||||
COMPRT_AR_$(1) := $$(AR_$(1))
|
COMPRT_AR_$(1) := $$(AR_$(1))
|
||||||
COMPRT_CFLAGS_$(1) := $$(CFG_GCCISH_CFLAGS_$(1))
|
# We chomp -Werror here because GCC warns about the type signature of
|
||||||
ifeq ($$(findstring msvc,$(1)),msvc)
|
# builtins not matching its own and the build fails. It's a bit hacky,
|
||||||
COMPRT_CC_$(1) := gcc
|
# but what can we do, we're building libclang-rt using GCC ......
|
||||||
COMPRT_AR_$(1) := ar
|
COMPRT_CFLAGS_$(1) := $$(subst -Werror,,$$(CFG_GCCISH_CFLAGS_$(1))) -std=c99
|
||||||
ifeq ($$(findstring i686,$(1)),i686)
|
|
||||||
COMPRT_CFLAGS_$(1) := $$(CFG_GCCISH_CFLAGS_$(1)) -m32
|
# FreeBSD Clang's packaging is problematic; it doesn't copy unwind.h to
|
||||||
else
|
# the standard include directory. This should really be in our changes to
|
||||||
COMPRT_CFLAGS_$(1) := $$(CFG_GCCISH_CFLAGS_$(1)) -m64
|
# compiler-rt, but we override the CFLAGS here so there isn't much choice
|
||||||
endif
|
ifeq ($$(findstring freebsd,$(1)),freebsd)
|
||||||
|
COMPRT_CFLAGS_$(1) += -I/usr/include/c++/v1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
|
$$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
|
||||||
|
@ -246,7 +255,7 @@ $$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
|
||||||
TargetTriple=$(1) \
|
TargetTriple=$(1) \
|
||||||
triple-builtins
|
triple-builtins
|
||||||
$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/builtins/libcompiler_rt.a $$@
|
$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/builtins/libcompiler_rt.a $$@
|
||||||
|
endif
|
||||||
################################################################################
|
################################################################################
|
||||||
# libbacktrace
|
# libbacktrace
|
||||||
#
|
#
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 58ab642c30d9f97735d5745b5d01781ee199c6ae
|
Subproject commit 96626ab9c1242b42a60df9b3cd9a0dc8920b5ea6
|
Loading…
Reference in New Issue