zefie/llvm-mingw
1
0 Fork 0
Code Activity

Use CMake's build and install functionality

Browse Source 
This allows simplification, this functionality was added long
ago to CMake.

Further motivation is to be able to re-direct the installation,
make/ninja install allow this by setting DESTDIR but this
generally doesnt work well with window paths (see [1]).

[1] - https://cmake.org/cmake/help/latest/envvar/DESTDIR.html#envvar:DESTDIR
This commit is contained in:
Norbert Lange authored and Martin Storsjö committed 2023-09-27 22:53:01 +03:00
1 parent 97cd12a63a
commit d0a03c46c0
5 files changed
+10 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build-compiler-rt.sh
+2 -4
View File
@@ -68,7 +68,6 @@ fi
if command -v ninja >/dev/null; then if command -v ninja >/dev/null; then
CMAKE_GENERATOR="Ninja" CMAKE_GENERATOR="Ninja"
BUILDCMD=ninja
else else
: ${CORES:=$(nproc 2>/dev/null)} : ${CORES:=$(nproc 2>/dev/null)}
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -79,7 +78,6 @@ else
CMAKE_GENERATOR="MSYS Makefiles" CMAKE_GENERATOR="MSYS Makefiles"
;; ;;
esac esac
BUILDCMD=make
fi fi
cd llvm-project/compiler-rt cd llvm-project/compiler-rt
@@ -123,8 +121,8 @@ for arch in $ARCHS; do
-DCMAKE_C_FLAGS_INIT="$CFGUARD_CFLAGS" \ -DCMAKE_C_FLAGS_INIT="$CFGUARD_CFLAGS" \
-DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \ -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
$SRC_DIR $SRC_DIR
$BUILDCMD ${CORES:+-j${CORES}} cmake --build . ${CORES:+-j${CORES}}
$BUILDCMD install cmake --install .
mkdir -p "$PREFIX/$arch-w64-mingw32/bin" mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
if [ -n "$SANITIZERS" ]; then if [ -n "$SANITIZERS" ]; then
mv "$CLANG_RESOURCE_DIR/lib/windows/"*.dll "$PREFIX/$arch-w64-mingw32/bin" mv "$CLANG_RESOURCE_DIR/lib/windows/"*.dll "$PREFIX/$arch-w64-mingw32/bin"
build-libcxx.sh
+2 -4
View File
@@ -62,7 +62,6 @@ cd runtimes
if command -v ninja >/dev/null; then if command -v ninja >/dev/null; then
CMAKE_GENERATOR="Ninja" CMAKE_GENERATOR="Ninja"
BUILDCMD=ninja
else else
: ${CORES:=$(nproc 2>/dev/null)} : ${CORES:=$(nproc 2>/dev/null)}
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -73,7 +72,6 @@ else
CMAKE_GENERATOR="MSYS Makefiles" CMAKE_GENERATOR="MSYS Makefiles"
;; ;;
esac esac
BUILDCMD=make
fi fi
for arch in $ARCHS; do for arch in $ARCHS; do
@@ -114,7 +112,7 @@ for arch in $ARCHS; do
-DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \ -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
.. ..
$BUILDCMD ${CORES:+-j${CORES}} cmake --build . ${CORES:+-j${CORES}}
$BUILDCMD install cmake --install .
cd .. cd ..
done done
build-lldb-mi.sh
+2 -3
View File
@@ -53,7 +53,6 @@ fi
if command -v ninja >/dev/null; then if command -v ninja >/dev/null; then
CMAKE_GENERATOR="Ninja" CMAKE_GENERATOR="Ninja"
BUILDCMD=ninja
else else
: ${CORES:=$(nproc 2>/dev/null)} : ${CORES:=$(nproc 2>/dev/null)}
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -64,7 +63,6 @@ else
CMAKE_GENERATOR="MSYS Makefiles" CMAKE_GENERATOR="MSYS Makefiles"
;; ;;
esac esac
BUILDCMD=make
fi fi
export LLVM_DIR="$PREFIX" export LLVM_DIR="$PREFIX"
@@ -147,4 +145,5 @@ cmake \
$CMAKEFLAGS \ $CMAKEFLAGS \
.. ..
$BUILDCMD ${CORES:+-j${CORES}} install/strip cmake --build . ${CORES:+-j${CORES}}
cmake --install . --strip
build-llvm.sh
+2 -3
View File
@@ -138,7 +138,6 @@ fi
if command -v ninja >/dev/null; then if command -v ninja >/dev/null; then
CMAKE_GENERATOR="Ninja" CMAKE_GENERATOR="Ninja"
BUILDCMD=ninja
else else
: ${CORES:=$(nproc 2>/dev/null)} : ${CORES:=$(nproc 2>/dev/null)}
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -149,7 +148,6 @@ else
CMAKE_GENERATOR="MSYS Makefiles" CMAKE_GENERATOR="MSYS Makefiles"
;; ;;
esac esac
BUILDCMD=make
fi fi
CMAKEFLAGS="$LLVM_CMAKEFLAGS" CMAKEFLAGS="$LLVM_CMAKEFLAGS"
@@ -309,6 +307,7 @@ cmake \
$CMAKEFLAGS \ $CMAKEFLAGS \
.. ..
$BUILDCMD ${CORES:+-j${CORES}} install/strip cmake --build . ${CORES:+-j${CORES}}
cmake --install . --strip
cp ../LICENSE.TXT $PREFIX cp ../LICENSE.TXT $PREFIX
build-openmp.sh
+2 -4
View File
@@ -52,7 +52,6 @@ cd llvm-project/openmp
if command -v ninja >/dev/null; then if command -v ninja >/dev/null; then
CMAKE_GENERATOR="Ninja" CMAKE_GENERATOR="Ninja"
BUILDCMD=ninja
else else
: ${CORES:=$(nproc 2>/dev/null)} : ${CORES:=$(nproc 2>/dev/null)}
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -63,7 +62,6 @@ else
CMAKE_GENERATOR="MSYS Makefiles" CMAKE_GENERATOR="MSYS Makefiles"
;; ;;
esac esac
BUILDCMD=make
fi fi
for arch in $ARCHS; do for arch in $ARCHS; do
@@ -95,8 +93,8 @@ for arch in $ARCHS; do
-DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \ -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
$CMAKEFLAGS \ $CMAKEFLAGS \
.. ..
$BUILDCMD ${CORES:+-j${CORES}} cmake --build . ${CORES:+-j${CORES}}
$BUILDCMD install cmake --install .
rm -f $PREFIX/$arch-w64-mingw32/bin/*iomp5md* rm -f $PREFIX/$arch-w64-mingw32/bin/*iomp5md*
rm -f $PREFIX/$arch-w64-mingw32/lib/*iomp5md* rm -f $PREFIX/$arch-w64-mingw32/lib/*iomp5md*
cd .. cd ..