Put src and output into its own directory

Author: topjohnwu

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
           sudo apt-get -y install cmake ninja-build libzstd-dev binutils-dev
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 18
+          sudo ./llvm.sh 19
           rm llvm.sh
           ./build.sh
 
@@ -101,9 +101,9 @@ jobs:
       - name: Build toolchain
         run: |
           brew reinstall ninja zstd binutils gpatch
-          ./build.sh clone build
+          ./build.sh clone build collect
           mkdir tmp
-          tar c out | xz --x86 --lzma2 > tmp/out.x64.tar.xz
+          tar c out/collect | xz --x86 --lzma2 > tmp/out.x64.tar.xz
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
@@ -129,9 +129,9 @@ jobs:
       - name: Build toolchain
         run: |
           brew reinstall ninja zstd binutils gpatch
-          ./build.sh clone build
+          ./build.sh clone build collect
           mkdir tmp
-          tar c out | xz > tmp/out.arm64.tar.xz
+          tar c out/collect | xz > tmp/out.arm64.tar.xz
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4

.gitignore

@@ -1,10 +1,5 @@
-/rust
+/src
 /out
-/rust-out
 /dist
 /tmp
-/ondk-*
 /*.zip
-/llvm-project
-/llvm_android
-/toolchain-utils

build-windows.sh

@@ -37,22 +37,24 @@ build() {
   set_llvm_cfg LLVM_ENABLE_LIBCXX TRUE
   # MinGW libstdc++ is incompatible with clang when LTO is enabled, we have to use libc++
   set_build_cfg llvm.use-libcxx true
-  set_build_cfg rust.use-lld self-contained
+  set_build_cfg rust.use-lld true
   set_build_cfg dist.include-mingw-linker true
 
-  cd rust
+  cd src/rust
   eval python ./x.py --config ../config.toml --build $TRIPLE $(print_build_cfg) install
-  cd ../
+  cd ../../
 }
 
 collect() {
-  cp -af rust-out out
-  cd out
+  cp -af out/rust out/collect
+  cd out/collect
+
+  local RUST_BUILD=../../src/rust/build
 
   find . -name '*.old' -delete
-  cp -af ../rust/build/$TRIPLE/llvm/bin llvm-bin || true
-  cp -an ../rust/build/$TRIPLE/llvm/bin/. llvm-bin/.
-  cp -af ../rust/build/tmp/dist/lib/rustlib/. lib/rustlib/.
+  cp -af $RUST_BUILD/$TRIPLE/llvm/bin llvm-bin || true
+  cp -an $RUST_BUILD/$TRIPLE/llvm/bin/. llvm-bin/.
+  cp -af $RUST_BUILD/tmp/dist/lib/rustlib/. lib/rustlib/.
 
   local MINGW_DIR=lib/rustlib/$TRIPLE/bin/self-contained
 
@@ -62,8 +64,8 @@ collect() {
   cp_sys_dlls $MINGW_DIR/ld.exe
   cp_sys_dlls $MINGW_DIR/x86_64-w64-mingw32-gcc.exe
 
-  strip_exe ../rust/build/$TRIPLE/llvm/bin/llvm-strip.exe
-  cd ..
+  strip_exe $RUST_BUILD/$TRIPLE/llvm/bin/llvm-strip.exe
+  cd ../../
 }
 
 cp_sys_dlls() {
@@ -75,10 +77,11 @@ cp_sys_dlls() {
 
 ndk() {
   dl_ndk
+  cd out
 
   # Copy the whole output folder into ndk
-  cp -af out ndk/toolchains/rust || true
-  cp -an out/. ndk/toolchains/rust/.
+  cp -af collect ndk/toolchains/rust || true
+  cp -an collect/. ndk/toolchains/rust/.
 
   cd ndk/toolchains
 
@@ -92,7 +95,7 @@ ndk() {
   update_dir rust/llvm-bin $LLVM_DIR/bin
   rm -rf rust/llvm-bin
 
-  cd ../..
+  cd ../../../
 }
 
 export PATH='/c/Program Files/Git/cmd':$PATH

build.sh

@@ -44,32 +44,35 @@ build() {
   else
     set_llvm_cfg LLVM_BINUTILS_INCDIR /usr/include
     set_build_cfg llvm.static-libstdcpp true
-    set_build_cfg rust.use-lld self-contained
+    set_build_cfg rust.use-lld true
   fi
 
   set_llvm_cfg LLVM_ENABLE_PLUGINS FORCE_ON
 
-  cd rust
-  eval python3 ./x.py --config ../config.toml --host $TRIPLE $(print_build_cfg) install
-  cd ../
+  cd src/rust
+  eval python3 ./x.py --config ../../config.toml --host $TRIPLE $(print_build_cfg) install
+  cd ../../
 }
 
 collect() {
-  cp -af rust-out out
-  cd out
+  cp -af out/rust out/collect
+  cd out/collect
+
+  local RUST_BUILD=../../src/rust/build
 
   find . -name '*.old' -delete
-  cp -af ../rust/build/$TRIPLE/llvm/bin llvm-bin
-  find ../rust/build/$TRIPLE/llvm/lib -name "*.${DYN_EXT}*" -exec cp -an {} lib \;
+  cp -af $RUST_BUILD/$TRIPLE/llvm/bin llvm-bin
+  find $RUST_BUILD/$TRIPLE/llvm/lib -name "*.${DYN_EXT}*" -exec cp -an {} lib \;
   strip_exe llvm-bin/llvm-strip
-  cd ..
+  cd ../../
 }
 
 ndk() {
   dl_ndk
+  cd out
 
   # Copy the whole output folder into ndk
-  cp -af out ndk/toolchains/rust
+  cp -af collect ndk/toolchains/rust
 
   cd ndk/toolchains
 
@@ -81,7 +84,7 @@ ndk() {
   cd $LLVM_DIR/lib
   ln -sf ../../../../rust/lib/*.$DYN_EXT* .
 
-  cd ../../../../../../
+  cd ../../../../../../../
 }
 
 

common.sh

@@ -47,17 +47,19 @@ strip_exe() {
 # url sha
 git_clone_sha() {
   local dir=${1##*/}
-  mkdir "$dir"
-  cd "$dir"
+  echo "Cloning into 'src/$dir'..."
+  mkdir -p "src/$dir"
+  cd "src/$dir"
   git init -q
   git remote add origin $1
   git fetch --depth 1 origin $2
   git reset --hard FETCH_HEAD
-  cd ../
+  cd ../../
 }
 
 git_clone_branch() {
-  git clone --single-branch --depth 1 --branch $2 $1
+  local dir=${1##*/}
+  git clone --single-branch --depth 1 --branch $2 $1 src/$dir
 }
 
 skip_submodule() {
@@ -66,24 +68,24 @@ skip_submodule() {
 }
 
 clone_llvm() {
-  rm -rf llvm-project llvm_android toolchain-utils
+  rm -rf src/llvm-project src/llvm_android src/toolchain-utils
 
   git_clone_sha https://android.googlesource.com/toolchain/llvm-project $LLVM_VERSION
   git_clone_sha https://android.googlesource.com/toolchain/llvm_android $LLVM_ANDROID_VERSION
   git_clone_sha https://android.googlesource.com/platform/external/toolchain-utils $TOOLCHAIN_UTILS_VERSION
 
   # Patch the LLVM source code
-  $PYTHON_CMD toolchain-utils/llvm_tools/patch_manager.py \
+  $PYTHON_CMD src/toolchain-utils/llvm_tools/patch_manager.py \
     --svn_version $LLVM_SVN \
-    --patch_metadata_file llvm_android/patches/PATCHES.json \
-    --src_path llvm-project
+    --patch_metadata_file src/llvm_android/patches/PATCHES.json \
+    --src_path src/llvm-project
 }
 
 clone_rust() {
-  rm -rf rust
+  rm -rf src/rust
 
   git_clone_branch https://github.com/rust-lang/rust $RUST_VERSION
-  cd rust
+  cd src/rust
 
   # Skip unused submodules
   skip_submodule llvm-project
@@ -95,15 +97,15 @@ clone_rust() {
   git submodule update --init --depth=1
 
   # Apply patches
-  for p in ../patches/*.patch; do
+  for p in ../../patches/*.patch; do
     patch -p1 < $p
   done
 
   # Link NDK LLVM into Rust's source
   rm -rf src/llvm-project
   ln -s ../../llvm-project src/llvm-project
 
-  cd ../
+  cd ../../
 }
 
 update_dir() {
@@ -135,14 +137,16 @@ dl_ndk() {
   [ -f $NDK_ZIP ] || curl -O -L "https://dl.google.com/android/repository/$NDK_ZIP"
   rm -rf $NDK_EXTRACT
   unzip -q $NDK_ZIP
-  mv $NDK_EXTRACT ndk
-  echo $OUTPUT_VERSION > ndk/ONDK_VERSION
+  mv $NDK_EXTRACT out/ndk
+  echo $OUTPUT_VERSION > out/ndk/ONDK_VERSION
 }
 
 dist() {
+  cd out
   mv ndk "ondk-${OUTPUT_VERSION}"
-  mkdir dist
-  tar c "ondk-${OUTPUT_VERSION}" | xz --x86 --lzma2 > "dist/ondk-${OUTPUT_VERSION}-${OS}.tar.xz"
+  mkdir ../dist
+  tar c "ondk-${OUTPUT_VERSION}" | xz --x86 --lzma2 > "../dist/ondk-${OUTPUT_VERSION}-${OS}.tar.xz"
+  cd ../
 }
 
 run_cmd() {
@@ -158,27 +162,25 @@ run_cmd() {
       clone_rust
       ;;
     build)
-      rm -rf rust-out
+      rm -rf out/rust
       # Set common LLVM configs
       set_llvm_cfg LLVM_VERSION_SUFFIX
       build
       ;;
     collect)
-      rm -rf out
+      rm -rf out/collect
       collect
       ;;
     ndk)
-      rm -rf ndk
+      rm -rf out/ndk
       ndk
       ;;
     dist)
-      rm -rf dist ondk-*
+      rm -rf dist out/ondk-*
       dist
       ;;
     clean)
-      rm -rf rust llvm-project llvm_android toolchain-utils \
-        out out.arm out.x86 ndk tmp mingw64 \
-        android-ndk-*.zip ondk-* dist mingw.7z
+      rm -rf src out dist tmp android-ndk-*.zip
       ;;
     *)
       echo "Unknown action \"$1\""

config.toml

@@ -26,7 +26,7 @@ tools = [
 cargo-native-static = true
 
 [install]
-prefix = "../rust-out"
+prefix = "../../out/rust"
 sysconfdir = "etc"
 
 [rust]
@@ -38,9 +38,9 @@ codegen-units = 1
 
 [target.x86_64-unknown-linux-gnu]
 llvm-has-rust-patches = false
-cc = "clang-18"
-cxx = "clang++-18"
-linker = "clang-18"
+cc = "clang-19"
+cxx = "clang++-19"
+linker = "clang-19"
 
 [target.aarch64-apple-darwin]
 llvm-has-rust-patches = false

dist-macos.sh

@@ -1,25 +1,25 @@
 #!/usr/bin/env bash
 
-# Copyright 2022-2024 Google LLC.
+# Copyright 2022-2025 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
 # This script is for generating universal binaries
 
 set -e
 
 xz -d < tmp/out.x64.tar.xz | tar x
-mv out out.x64
+mv out/collect out/collect.x64
 xz -d < tmp/out.arm64.tar.xz | tar x
-mv out out.arm64
+mv out/collect out/collect.arm64
 
-cp -af out.x64 out
-cp -an out.arm64/. out/. || true
+cp -af out/collect.x64 out/collect
+cp -an out/collect.arm64/. out/collect/. || true
 
 # Merge all Mach-O files as universal binary and adhoc codesign
-find out -type f -exec sh -c "file {} | grep -q Mach-O" \; -print0 | \
+find out/collect -type f -exec sh -c "file {} | grep -q Mach-O" \; -print0 | \
 while IFS= read -r -d '' o; do
-  a="${o/out/out.x64}"
-  b="${o/out/out.arm64}"
+  a="${o/collect/collect.x64}"
+  b="${o/collect/collect.arm64}"
   if [ -f "$a" -a -f "$b" ]; then
       lipo -create -output "$o" "$a" "$b"
   fi