Skip to content

Commit

Permalink
build: Put included LLVM in a subdirectory of the release
Browse files Browse the repository at this point in the history
* build/unix/release-with-batteries.sh: Move the included LLVM (and
  LLVM libunwind where applicable) to a subdirectory of the release
  distribution directory to prevent polluting PATH with non-Dylan
  binaries.
  • Loading branch information
housel committed Jan 4, 2025
1 parent 9c461cf commit 419c6b9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build/unix/release-with-batteries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ if $NEED_LIBUNWIND; then
fi
(cd ${LLVM_DIST};
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=OFF \
-DCMAKE_INSTALL_PREFIX=${DISTDIR} \
-DCMAKE_INSTALL_PREFIX=${DISTDIR}/llvm \
-DLLVM_TARGETS_TO_BUILD:STRING="Native" \
-DLLVM_ENABLE_PROJECTS="llvm;clang;lld" \
${RT_OPTS} \
Expand Down Expand Up @@ -133,13 +133,13 @@ fi
-DLLVM_PARALLEL_COMPILE_JOBS=${DYLAN_JOBS} \
llvm;
ninja install-clang install-lld install-clang-resource-headers ${RT_TARGETS})
CC="${DISTDIR}/bin/clang${SYSROOT}"
CXX="${DISTDIR}/bin/clang++${SYSROOT}"
CC="${DISTDIR}/llvm/bin/clang${SYSROOT}"
CXX="${DISTDIR}/llvm/bin/clang++${SYSROOT}"

RTLIBS_INSTALL=

if $NEED_LIBUNWIND; then
for i in ${DISTDIR}/lib/*/libunwind*; do
for i in ${DISTDIR}/llvm/lib/*/libunwind*; do
RTLIBS_INSTALL="$RTLIBS_INSTALL $i"
done
fi
Expand Down

0 comments on commit 419c6b9

Please sign in to comment.