From 5ebcccc5fcd57e1b6406ffa4460a8b4670cacf7d Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 14 Aug 2024 00:03:56 +0800 Subject: [PATCH] test --- .gitignore | 1 + build-flang.sh | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 1af678a..0357f37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Build files llvm-toolchain* +output/ diff --git a/build-flang.sh b/build-flang.sh index d25c980..f6c3ae8 100644 --- a/build-flang.sh +++ b/build-flang.sh @@ -5,9 +5,9 @@ set -e -o pipefail -u : ${BUILD_ARCH_OR_TYPE:=host} : ${DEFAULT_ANDROID_API_LEVEL:=21} : ${ANDROID_NDK:=~/lib/android-ndk-r27} -: ${FLANG_MAKE_PROCESSES:=1} +: ${FLANG_MAKE_PROCESSES:=20} -patch -p1 -d $(pwd)/out/llvm-project < flang-undef-macros.patch +# patch -p1 -d $(pwd)/out/llvm-project < ../flang-undef-macros.patch ANDROID_TRIPLE="$BUILD_ARCH_OR_TYPE-linux-android" CC_HOST_PLATFORM=$BUILD_ARCH_OR_TYPE-linux-android$DEFAULT_ANDROID_API_LEVEL @@ -50,15 +50,13 @@ _EXTRA_CONFIGURE_ARGS=" -DLLVM_HOST_TRIPLE=${CC_HOST_PLATFORM/-/-unknown-} " -_HOST_RPATH='$ORIGIN:$ORIGIN/../lib/x86_64-unknown-linux-gnu:$ORIGIN/../lib' - _CONFIGURE_ARGS=() _CONFIGURE_ARGS+=("-DCMAKE_C_COMPILER=$(pwd)/out/stage2-install/bin/clang") _CONFIGURE_ARGS+=("-DCMAKE_CXX_COMPILER=$(pwd)/out/stage2-install/bin/clang++") _CONFIGURE_ARGS+=("-DCMAKE_LINKER=$(pwd)/out/stage2-install/bin/ld.lld") -_CONFIGURE_ARGS+=("-DCMAKE_CXX_FLAGS=-stdlib=libc++ -Wl,-rpath=$_HOST_RPATH") -_CONFIGURE_ARGS+=("-DCMAKE_EXE_LINKER_FLAGS=-stdlib=libc++ -Wl,-rpath=$_HOST_RPATH") -_CONFIGURE_ARGS+=("-DCMAKE_INSTALL_RPATH=$_HOST_RPATH") +_CONFIGURE_ARGS+=("-DCMAKE_CXX_FLAGS=-stdlib=libc++ -Wno-deprecated-copy") +_CONFIGURE_ARGS+=("-DCMAKE_EXE_LINKER_FLAGS=-stdlib=libc++") +_CONFIGURE_ARGS+=("-DCMAKE_INSTALL_RPATH=\$ORIGIN:\$ORIGIN/../lib/x86_64-unknown-linux-gnu:\$ORIGIN/../lib") _BUILD_TARGET="" if [ "$BUILD_ARCH_OR_TYPE" != "host" ]; then @@ -76,7 +74,7 @@ if [ "$BUILD_ARCH_OR_TYPE" != "host" ]; then echo "!" > $NDK_STANDALONE_TOOLCHAIN_DIR/sysroot/usr/lib/$ANDROID_TRIPLE/libzstd.a _BUILD_TARGET="Fortran_main FortranRuntime FortranDecimal" else - export LD_LIBRARY_PATH="$(pwd)/out/stage2-install/lib:${LD_LIBRARY_PATH:-}" + export LD_LIBRARY_PATH="$(pwd)/out/stage2-install/lib:$(pwd)/out/stage2-install/lib/x86_64-unknown-linux-gnu:${LD_LIBRARY_PATH:-}" fi mkdir -p build-$BUILD_ARCH_OR_TYPE-install