zefie/llvm-mingw
1
0 Fork 0
Code Activity

Quote uses of $PREFIX in the build script, to improve support for installing into a path that contains spaces

Browse Source 
For build-mingw-w64.sh to succeed when installing to such a path,
the mingw-w64 version has to be updated to the latest git master.

build-mingw-w64-libraries.sh still fails in this case, as libtool
fails to properly quote $LD in a test for whether the linker is GNU ld.
This commit is contained in:
Martin Storsjö committed 2019-12-03 21:49:53 +02:00
1 parent ee555b9013
commit 64d39428b6
7 files changed
+49 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build-compiler-rt.sh
+10 -10
View File
@@ -29,7 +29,7 @@ export PATH="$PREFIX/bin:$PATH"
: ${CORES:=4} : ${CORES:=4}
: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}} : ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
CLANG_VERSION=$(basename $(dirname $(dirname $(dirname $($PREFIX/bin/clang --print-libgcc-file-name -rtlib=compiler-rt))))) CLANG_VERSION=$(basename "$(dirname "$(dirname "$(dirname "$("$PREFIX/bin/clang" --print-libgcc-file-name -rtlib=compiler-rt)")")")")
if [ ! -d llvm-project/compiler-rt ] || [ -n "$SYNC" ]; then if [ ! -d llvm-project/compiler-rt ] || [ -n "$SYNC" ]; then
CHECKOUT_ONLY=1 ./build-llvm.sh CHECKOUT_ONLY=1 ./build-llvm.sh
@@ -38,8 +38,8 @@ fi
# Add a symlink for i386 -> i686; we normally name the toolchain # Add a symlink for i386 -> i686; we normally name the toolchain
# i686-w64-mingw32, but due to the compiler-rt cmake peculiarities, we # i686-w64-mingw32, but due to the compiler-rt cmake peculiarities, we
# need to refer to it as i386 at this stage. # need to refer to it as i386 at this stage.
if [ ! -e $PREFIX/i386-w64-mingw32 ]; then if [ ! -e "$PREFIX/i386-w64-mingw32" ]; then
ln -sfn i686-w64-mingw32 $PREFIX/i386-w64-mingw32 || true ln -sfn i686-w64-mingw32 "$PREFIX/i386-w64-mingw32" || true
fi fi
cd llvm-project/compiler-rt cd llvm-project/compiler-rt
@@ -80,12 +80,12 @@ for arch in $ARCHS; do
cmake \ cmake \
${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \ ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \ -DCMAKE_INSTALL_PREFIX="$PREFIX/$arch-w64-mingw32" \
-DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \ -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
-DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \ -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
-DCMAKE_SYSTEM_NAME=Windows \ -DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_AR=$PREFIX/bin/llvm-ar \ -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
-DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \ -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
-DCMAKE_C_COMPILER_WORKS=1 \ -DCMAKE_C_COMPILER_WORKS=1 \
-DCMAKE_CXX_COMPILER_WORKS=1 \ -DCMAKE_CXX_COMPILER_WORKS=1 \
-DCMAKE_C_COMPILER_TARGET=$buildarchname-windows-gnu \ -DCMAKE_C_COMPILER_TARGET=$buildarchname-windows-gnu \
@@ -93,14 +93,14 @@ for arch in $ARCHS; do
-DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \ -DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \
$SRC_DIR $SRC_DIR
make -j$CORES make -j$CORES
mkdir -p $PREFIX/lib/clang/$CLANG_VERSION/lib/windows mkdir -p "$PREFIX/lib/clang/$CLANG_VERSION/lib/windows"
mkdir -p $PREFIX/$arch-w64-mingw32/bin mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
for i in lib/windows/libclang_rt.*-$buildarchname*.a; do for i in lib/windows/libclang_rt.*-$buildarchname*.a; do
cp $i $PREFIX/lib/clang/$CLANG_VERSION/lib/windows/$(basename $i | sed s/$buildarchname/$libarchname/) cp $i "$PREFIX/lib/clang/$CLANG_VERSION/lib/windows/$(basename $i | sed s/$buildarchname/$libarchname/)"
done done
for i in lib/windows/libclang_rt.*-$buildarchname*.dll; do for i in lib/windows/libclang_rt.*-$buildarchname*.dll; do
if [ -f $i ]; then if [ -f $i ]; then
cp $i $PREFIX/$arch-w64-mingw32/bin cp $i "$PREFIX/$arch-w64-mingw32/bin"
fi fi
done done
if [ -n "$SANITIZERS" ]; then if [ -n "$SANITIZERS" ]; then
build-libcxx.sh
+16 -16
View File
@@ -71,7 +71,7 @@ build_all() {
cmake \ cmake \
${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \ ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \ -DCMAKE_INSTALL_PREFIX="$PREFIX/$arch-w64-mingw32" \
-DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \ -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
-DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \ -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
-DCMAKE_CROSSCOMPILING=TRUE \ -DCMAKE_CROSSCOMPILING=TRUE \
@@ -79,8 +79,8 @@ build_all() {
-DCMAKE_C_COMPILER_WORKS=TRUE \ -DCMAKE_C_COMPILER_WORKS=TRUE \
-DCMAKE_CXX_COMPILER_WORKS=TRUE \ -DCMAKE_CXX_COMPILER_WORKS=TRUE \
-DLLVM_COMPILER_CHECKED=TRUE \ -DLLVM_COMPILER_CHECKED=TRUE \
-DCMAKE_AR=$PREFIX/bin/llvm-ar \ -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
-DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \ -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
-DCXX_SUPPORTS_CXX11=TRUE \ -DCXX_SUPPORTS_CXX11=TRUE \
-DCXX_SUPPORTS_CXX_STD=TRUE \ -DCXX_SUPPORTS_CXX_STD=TRUE \
-DLIBUNWIND_USE_COMPILER_RT=TRUE \ -DLIBUNWIND_USE_COMPILER_RT=TRUE \
@@ -94,8 +94,8 @@ build_all() {
make -j$CORES make -j$CORES
make install make install
if [ "$type" = "shared" ]; then if [ "$type" = "shared" ]; then
mkdir -p $PREFIX/$arch-w64-mingw32/bin mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
cp lib/libunwind.dll $PREFIX/$arch-w64-mingw32/bin cp lib/libunwind.dll "$PREFIX/$arch-w64-mingw32/bin"
fi fi
cd .. cd ..
done done
@@ -113,7 +113,7 @@ build_all() {
cmake \ cmake \
${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \ ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \ -DCMAKE_INSTALL_PREFIX="$PREFIX/$arch-w64-mingw32" \
-DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \ -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
-DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \ -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
-DCMAKE_CROSSCOMPILING=TRUE \ -DCMAKE_CROSSCOMPILING=TRUE \
@@ -121,8 +121,8 @@ build_all() {
-DCMAKE_C_COMPILER_WORKS=TRUE \ -DCMAKE_C_COMPILER_WORKS=TRUE \
-DCMAKE_CXX_COMPILER_WORKS=TRUE \ -DCMAKE_CXX_COMPILER_WORKS=TRUE \
-DLLVM_COMPILER_CHECKED=TRUE \ -DLLVM_COMPILER_CHECKED=TRUE \
-DCMAKE_AR=$PREFIX/bin/llvm-ar \ -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
-DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \ -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
-DLIBCXXABI_USE_COMPILER_RT=ON \ -DLIBCXXABI_USE_COMPILER_RT=ON \
-DLIBCXXABI_ENABLE_EXCEPTIONS=ON \ -DLIBCXXABI_ENABLE_EXCEPTIONS=ON \
-DLIBCXXABI_ENABLE_THREADS=ON \ -DLIBCXXABI_ENABLE_THREADS=ON \
@@ -151,7 +151,7 @@ build_all() {
cmake \ cmake \
${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \ ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \ -DCMAKE_INSTALL_PREFIX="$PREFIX/$arch-w64-mingw32" \
-DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \ -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
-DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \ -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
-DCMAKE_CROSSCOMPILING=TRUE \ -DCMAKE_CROSSCOMPILING=TRUE \
@@ -159,8 +159,8 @@ build_all() {
-DCMAKE_C_COMPILER_WORKS=TRUE \ -DCMAKE_C_COMPILER_WORKS=TRUE \
-DCMAKE_CXX_COMPILER_WORKS=TRUE \ -DCMAKE_CXX_COMPILER_WORKS=TRUE \
-DLLVM_COMPILER_CHECKED=TRUE \ -DLLVM_COMPILER_CHECKED=TRUE \
-DCMAKE_AR=$PREFIX/bin/llvm-ar \ -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
-DCMAKE_RANLIB=$PREFIX/bin/llvm-ranlib \ -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
-DLIBCXX_USE_COMPILER_RT=ON \ -DLIBCXX_USE_COMPILER_RT=ON \
-DLIBCXX_INSTALL_HEADERS=ON \ -DLIBCXX_INSTALL_HEADERS=ON \
-DLIBCXX_ENABLE_EXCEPTIONS=ON \ -DLIBCXX_ENABLE_EXCEPTIONS=ON \
@@ -187,13 +187,13 @@ build_all() {
make install make install
if [ "$type" = "shared" ]; then if [ "$type" = "shared" ]; then
llvm-ar qcsL \ llvm-ar qcsL \
$PREFIX/$arch-w64-mingw32/lib/libc++.dll.a \ "$PREFIX/$arch-w64-mingw32/lib/libc++.dll.a" \
$PREFIX/$arch-w64-mingw32/lib/libunwind.dll.a "$PREFIX/$arch-w64-mingw32/lib/libunwind.dll.a"
cp lib/libc++.dll $PREFIX/$arch-w64-mingw32/bin cp lib/libc++.dll "$PREFIX/$arch-w64-mingw32/bin"
else else
llvm-ar qcsL \ llvm-ar qcsL \
$PREFIX/$arch-w64-mingw32/lib/libc++.a \ "$PREFIX/$arch-w64-mingw32/lib/libc++.a" \
$PREFIX/$arch-w64-mingw32/lib/libunwind.a "$PREFIX/$arch-w64-mingw32/lib/libunwind.a"
fi fi
cd .. cd ..
done done
build-libssp.sh
+5 -5
View File
@@ -42,10 +42,10 @@ for arch in $ARCHS; do
mkdir -p build-$arch mkdir -p build-$arch
cd build-$arch cd build-$arch
make -f ../Makefile -j$CORES CROSS=$arch-w64-mingw32- make -f ../Makefile -j$CORES CROSS=$arch-w64-mingw32-
mkdir -p $PREFIX/$arch-w64-mingw32/bin mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
cp libssp.a $PREFIX/$arch-w64-mingw32/lib cp libssp.a "$PREFIX/$arch-w64-mingw32/lib"
cp libssp_nonshared.a $PREFIX/$arch-w64-mingw32/lib cp libssp_nonshared.a "$PREFIX/$arch-w64-mingw32/lib"
cp libssp.dll.a $PREFIX/$arch-w64-mingw32/lib cp libssp.dll.a "$PREFIX/$arch-w64-mingw32/lib"
cp libssp-0.dll $PREFIX/$arch-w64-mingw32/bin cp libssp-0.dll "$PREFIX/$arch-w64-mingw32/bin"
cd .. cd ..
done done
build-mingw-w64-libraries.sh
+1 -1
View File
@@ -22,7 +22,7 @@ for lib in winpthreads winstorecompat; do
for arch in $ARCHS; do for arch in $ARCHS; do
mkdir -p build-$arch mkdir -p build-$arch
cd build-$arch cd build-$arch
../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32 --libdir=$PREFIX/$arch-w64-mingw32/lib ../configure --host=$arch-w64-mingw32 --prefix="$PREFIX/$arch-w64-mingw32" --libdir="$PREFIX/$arch-w64-mingw32/lib"
make -j$CORES make -j$CORES
make install make install
cd .. cd ..
build-mingw-w64.sh
+9 -9
View File
@@ -65,23 +65,23 @@ fi
# runtime and don't need to rebuild it. # runtime and don't need to rebuild it.
if [ -z "$HOST" ]; then if [ -z "$HOST" ]; then
if [ -z "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then if [ -z "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then
HEADER_ROOT=$PREFIX/generic-w64-mingw32 HEADER_ROOT="$PREFIX/generic-w64-mingw32"
else else
HEADER_ROOT=$PREFIX HEADER_ROOT="$PREFIX"
fi fi
cd mingw-w64-headers cd mingw-w64-headers
mkdir -p build mkdir -p build
cd build cd build
../configure --prefix=$HEADER_ROOT \ ../configure --prefix="$HEADER_ROOT" \
--enable-idl --with-default-win32-winnt=$DEFAULT_WIN32_WINNT --with-default-msvcrt=$DEFAULT_MSVCRT INSTALL="install -C" --enable-idl --with-default-win32-winnt=$DEFAULT_WIN32_WINNT --with-default-msvcrt=$DEFAULT_MSVCRT INSTALL="install -C"
make install make install
cd ../.. cd ../..
if [ -z "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then if [ -z "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then
for arch in $ARCHS; do for arch in $ARCHS; do
mkdir -p $PREFIX/$arch-w64-mingw32 mkdir -p "$PREFIX/$arch-w64-mingw32"
if [ ! -e $PREFIX/$arch-w64-mingw32/include ]; then if [ ! -e "$PREFIX/$arch-w64-mingw32/include" ]; then
ln -sfn ../generic-w64-mingw32/include $PREFIX/$arch-w64-mingw32/include ln -sfn ../generic-w64-mingw32/include "$PREFIX/$arch-w64-mingw32/include"
fi fi
done done
fi fi
@@ -105,7 +105,7 @@ if [ -z "$HOST" ]; then
;; ;;
esac esac
FLAGS="$FLAGS --with-default-msvcrt=$DEFAULT_MSVCRT" FLAGS="$FLAGS --with-default-msvcrt=$DEFAULT_MSVCRT"
../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32 $FLAGS ../configure --host=$arch-w64-mingw32 --prefix="$PREFIX/$arch-w64-mingw32" $FLAGS
make -j$CORES make -j$CORES
make install make install
cd .. cd ..
@@ -142,12 +142,12 @@ cd mingw-w64-tools/widl
for arch in $ARCHS; do for arch in $ARCHS; do
mkdir -p build-$CROSS_NAME$arch mkdir -p build-$CROSS_NAME$arch
cd build-$CROSS_NAME$arch cd build-$CROSS_NAME$arch
../configure --prefix=$PREFIX --target=$arch-w64-mingw32 $CONFIGFLAGS LDFLAGS="-Wl,-s" ../configure --prefix="$PREFIX" --target=$arch-w64-mingw32 $CONFIGFLAGS LDFLAGS="-Wl,-s"
make -j$CORES make -j$CORES
make install make install
cd .. cd ..
done done
cd $PREFIX/bin cd "$PREFIX/bin"
if [ -n "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then if [ -n "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then
for arch in $ALL_ARCHS; do for arch in $ALL_ARCHS; do
if [ "$arch" != "$ARCHS" ]; then if [ "$arch" != "$ARCHS" ]; then
install-wrappers.sh
+7 -7
View File
@@ -45,18 +45,18 @@ if [ -n "$EXEEXT" ]; then
WRAPPER_FLAGS="$WRAPPER_FLAGS -municode -DCLANG=\"clang-$CLANG_MAJOR\"" WRAPPER_FLAGS="$WRAPPER_FLAGS -municode -DCLANG=\"clang-$CLANG_MAJOR\""
fi fi
mkdir -p $PREFIX/bin mkdir -p "$PREFIX/bin"
cp wrappers/*-wrapper.sh $PREFIX/bin cp wrappers/*-wrapper.sh "$PREFIX/bin"
if [ -n "$HOST" ]; then if [ -n "$HOST" ]; then
# TODO: If building natively on msys, pick up the default HOST value from there. # TODO: If building natively on msys, pick up the default HOST value from there.
WRAPPER_FLAGS="$WRAPPER_FLAGS -DDEFAULT_TARGET=\"$HOST\"" WRAPPER_FLAGS="$WRAPPER_FLAGS -DDEFAULT_TARGET=\"$HOST\""
for i in wrappers/*-wrapper.sh; do for i in wrappers/*-wrapper.sh; do
cat $i | sed 's/^DEFAULT_TARGET=.*/DEFAULT_TARGET='$HOST/ > $PREFIX/bin/$(basename $i) cat $i | sed 's/^DEFAULT_TARGET=.*/DEFAULT_TARGET='$HOST/ > "$PREFIX/bin/$(basename $i)"
done done
fi fi
$CC wrappers/clang-target-wrapper.c -o $PREFIX/bin/clang-target-wrapper$EXEEXT -O2 -Wl,-s $WRAPPER_FLAGS $CC wrappers/clang-target-wrapper.c -o "$PREFIX/bin/clang-target-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
$CC wrappers/windres-wrapper.c -o $PREFIX/bin/windres-wrapper$EXEEXT -O2 -Wl,-s $WRAPPER_FLAGS $CC wrappers/windres-wrapper.c -o "$PREFIX/bin/windres-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
$CC wrappers/llvm-wrapper.c -o $PREFIX/bin/llvm-wrapper$EXEEXT -O2 -Wl,-s $WRAPPER_FLAGS $CC wrappers/llvm-wrapper.c -o "$PREFIX/bin/llvm-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
if [ -n "$EXEEXT" ]; then if [ -n "$EXEEXT" ]; then
# For Windows, we should prefer the executable wrapper, which also works # For Windows, we should prefer the executable wrapper, which also works
# when invoked from outside of MSYS. # when invoked from outside of MSYS.
@@ -65,7 +65,7 @@ if [ -n "$EXEEXT" ]; then
else else
CTW_SUFFIX=.sh CTW_SUFFIX=.sh
fi fi
cd $PREFIX/bin cd "$PREFIX/bin"
for arch in $ARCHS; do for arch in $ARCHS; do
for target_os in $TARGET_OSES; do for target_os in $TARGET_OSES; do
for exec in clang clang++ gcc g++ cc c99 c11 c++; do for exec in clang clang++ gcc g++ cc c99 c11 c++; do
wrappers/clang-target-wrapper.sh
+1 -1
View File
@@ -71,4 +71,4 @@ FLAGS="$FLAGS -fuse-ld=lld"
FLAGS="$FLAGS -fuse-cxa-atexit" FLAGS="$FLAGS -fuse-cxa-atexit"
FLAGS="$FLAGS -Qunused-arguments" FLAGS="$FLAGS -Qunused-arguments"
$CCACHE $CLANG $FLAGS "$@" $CCACHE "$CLANG" $FLAGS "$@"