From 167b54d03d612c773a47f2a2b3b88c92265d1b3b Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Sun, 3 Dec 2023 09:04:50 +0330 Subject: [PATCH] Ports: Make the LLVM port install its ocaml bindings somewhere else By default the bindings go to /usr/local on the host, which is a very big no-no; this path is not affected by CMAKE_INSTALL_PREFIX, so this commit sets the LLVM_OCAML_INSTALL_PATH variable instead. It should be noted that disabling the ocaml bindings doesn't make all the users of this variable go away, so this commit doesn't do so. This also sorts the -DFOO options passed to cmake, because...sorting. --- Ports/llvm/package.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Ports/llvm/package.sh b/Ports/llvm/package.sh index eb09d6a5d5..5c9eace709 100755 --- a/Ports/llvm/package.sh +++ b/Ports/llvm/package.sh @@ -36,15 +36,15 @@ configure() { cmake ${workdir}/llvm \ -G Ninja \ -B llvm-build "${configopts[@]}" \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DCMAKE_FIND_ROOT_PATH="$SERENITY_BUILD_DIR"/Root \ - -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_C_COMPILER=$CC;-DCMAKE_CXX_COMPILER=$CXX" \ -DCLANG_DEFAULT_CXX_STDLIB=$stdlib \ -DCLANG_DEFAULT_UNWINDLIB=$unwindlib \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_FIND_ROOT_PATH="$SERENITY_BUILD_DIR"/Root \ -DCOMPILER_RT_BUILD_CRT=ON \ -DCOMPILER_RT_BUILD_ORC=OFF \ -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=$exclude_atomic_builtin \ -DCOMPILER_RT_OS_DIR=serenity \ + -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_C_COMPILER=$CC;-DCMAKE_CXX_COMPILER=$CXX" \ -DHAVE_LIBRT=OFF \ -DLLVM_DEFAULT_TARGET_TRIPLE=$SERENITY_ARCH-pc-serenity \ -DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt" \ @@ -52,6 +52,7 @@ configure() { -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON \ + -DLLVM_OCAML_INSTALL_PATH="${SERENITY_INSTALL_ROOT}/usr/local/ocaml" \ -DLLVM_PTHREAD_LIB=pthread \ -DLLVM_TARGETS_TO_BUILD=X86 }