mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-18 18:06:56 +01:00
119 lines
3.9 KiB
Diff
119 lines
3.9 KiB
Diff
From b875d7c1360c8ff2077463d7a5a12e1cff1cc683 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
|
|
Date: Mon, 12 Jul 2021 13:34:32 +0200
|
|
Subject: [PATCH] compiler-rt: Add option to automate install process
|
|
|
|
Also mention that compiler-rt can be needed to build code using
|
|
`__builtin_available()`.
|
|
|
|
Fixes #278.
|
|
---
|
|
README.COMPILER-RT.md | 4 ++++
|
|
README.md | 3 +++
|
|
build_compiler_rt.sh | 33 ++++++++++++++++++++++++---------
|
|
3 files changed, 31 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/README.COMPILER-RT.md b/README.COMPILER-RT.md
|
|
index b2754dfcf..dced89686 100644
|
|
--- a/README.COMPILER-RT.md
|
|
+++ b/README.COMPILER-RT.md
|
|
@@ -10,6 +10,10 @@ Ensure you have finished `build.sh`,
|
|
|
|
then run: `./build_compiler_rt.sh`.
|
|
|
|
+By default, installation steps for compiler-rt will be printed to the terminal
|
|
+to run manually, but you can automate the installation process by defining
|
|
+`ENABLE_COMPILER_RT_INSTALL`.
|
|
+
|
|
You can verify compiler-rt is working by invoking the following command:
|
|
|
|
echo "int main(void){return 0;}" | xcrun clang -xc -o/dev/null -v - 2>&1 | \
|
|
diff --git a/README.md b/README.md
|
|
index 60d19f917..f32bf626c 100644
|
|
--- a/README.md
|
|
+++ b/README.md
|
|
@@ -33,6 +33,9 @@ It also includes scripts for optionally building
|
|
* the "compiler-rt" runtime library, and
|
|
* the `llvm-dsymutil` tool required for debugging.
|
|
|
|
+Note: The "compiler-rt" library can be needed to link code that uses the
|
|
+`__builtin_available()` runtime version check.
|
|
+
|
|
|
|
### WHAT CAN BE BUILT WITH IT? ###
|
|
|
|
diff --git a/build_compiler_rt.sh b/build_compiler_rt.sh
|
|
index 8f47262a2..508742cab 100755
|
|
--- a/build_compiler_rt.sh
|
|
+++ b/build_compiler_rt.sh
|
|
@@ -182,22 +182,39 @@ fi
|
|
rm -f $BUILD_DIR/.compiler-rt_build_complete
|
|
|
|
|
|
+# Installation. Can be either automated (ENABLE_COMPILER_RT_INSTALL) or will
|
|
+# print the commands that the user should run manually.
|
|
+
|
|
+function print_or_run() {
|
|
+ if [ -z "$ENABLE_COMPILER_RT_INSTALL" ]; then
|
|
+ echo "$@"
|
|
+ else
|
|
+ $@
|
|
+ fi
|
|
+}
|
|
+
|
|
echo ""
|
|
echo ""
|
|
echo ""
|
|
-echo "Please run the following commands by hand to install compiler-rt:"
|
|
+if [ -z "$ENABLE_COMPILER_RT_INSTALL" ]; then
|
|
+ echo "Please run the following commands by hand to install compiler-rt:"
|
|
+else
|
|
+ echo "Installing compiler-rt headers and libraries to the following paths:"
|
|
+ echo " ${CLANG_INCLUDE_DIR}"
|
|
+ echo " ${CLANG_DARWIN_LIB_DIR}"
|
|
+fi
|
|
echo ""
|
|
|
|
-echo "mkdir -p ${CLANG_INCLUDE_DIR}"
|
|
-echo "mkdir -p ${CLANG_DARWIN_LIB_DIR}"
|
|
-echo "cp -rv $BUILD_DIR/compiler-rt/compiler-rt/include/sanitizer ${CLANG_INCLUDE_DIR}"
|
|
+print_or_run mkdir -p ${CLANG_INCLUDE_DIR}
|
|
+print_or_run mkdir -p ${CLANG_DARWIN_LIB_DIR}
|
|
+print_or_run cp -rv $BUILD_DIR/compiler-rt/compiler-rt/include/sanitizer ${CLANG_INCLUDE_DIR}
|
|
|
|
if [ $USE_CMAKE -eq 1 ]; then
|
|
|
|
### CMAKE ###
|
|
|
|
- echo "cp -v $BUILD_DIR/compiler-rt/compiler-rt/build/lib/darwin/*.a ${CLANG_DARWIN_LIB_DIR}"
|
|
- echo "cp -v $BUILD_DIR/compiler-rt/compiler-rt/build/lib/darwin/*.dylib ${CLANG_DARWIN_LIB_DIR}"
|
|
+ print_or_run cp -v $BUILD_DIR/compiler-rt/compiler-rt/build/lib/darwin/*.a ${CLANG_DARWIN_LIB_DIR}
|
|
+ print_or_run cp -v $BUILD_DIR/compiler-rt/compiler-rt/build/lib/darwin/*.dylib ${CLANG_DARWIN_LIB_DIR}
|
|
|
|
### CMAKE END ###
|
|
|
|
@@ -209,7 +226,7 @@ else
|
|
|
|
function print_install_command() {
|
|
if [ -f "$1" ]; then
|
|
- echo "cp $PWD/compiler-rt/$1 ${CLANG_DARWIN_LIB_DIR}/$2"
|
|
+ print_or_run cp $PWD/compiler-rt/$1 ${CLANG_DARWIN_LIB_DIR}/$2
|
|
fi
|
|
}
|
|
|
|
@@ -219,14 +236,12 @@ else
|
|
print_install_command "cc_kext/libcompiler_rt.a" "libclang_rt.cc_kext.a"
|
|
print_install_command "profile_osx/libcompiler_rt.a" "libclang_rt.profile_osx.a"
|
|
|
|
-
|
|
print_install_command "ubsan_osx_dynamic/libcompiler_rt.dylib" \
|
|
"libclang_rt.ubsan_osx_dynamic.dylib"
|
|
|
|
print_install_command "asan_osx_dynamic/libcompiler_rt.dylib" \
|
|
"libclang_rt.asan_osx_dynamic.dylib"
|
|
|
|
-
|
|
popd &>/dev/null
|
|
|
|
### MAKE END ###
|