prepackage llvm into linux distributables

Author: tmarsteel

.github/workflows/build-emerge.yaml

@@ -28,6 +28,7 @@ env:
   GCC_GIT_REF: "releases/gcc-14.1.0"
   LIBUNWIND_GIT_REF: "v1.8.1"
   LLVM_MAJOR_VERSION: "20"
+  LLVM_MINOR_VERSION: "1"
   ZULU_JRE_URL: https://cdn.azul.com/zulu/bin/zulu21.36.17-ca-jre21.0.4-win_x64.zip
 
 jobs:
@@ -138,6 +139,8 @@ jobs:
       - name: mvn clean verify
         if: steps.cache-emerge-toolchain-maven.outputs.cache-hit != 'true'
         run: mvn "-Demerge.llvm-tests.llvm-install-dir=/usr/lib/llvm-20" -B clean verify
+  llvm-build-for-linux:
+    uses: ./.github/workflows/build-llvm-linux.yaml
   linux-distributables:
     name: Linux distributable archives
     runs-on: ubuntu-22.04
@@ -148,11 +151,18 @@ jobs:
       - build-glibc-x86_64
       - build-libunwind-x86_64
       - emerge-toolchain-maven
+      - llvm-build-for-linux
     steps:
       - name: checkout
         uses: actions/checkout@v4
         with:
           ref: "${{ inputs.ref || github.sha }}"
+      - name: get LLVM binaries
+        uses: actions/download-artifact@v4.1.8
+        with:
+          run-id: "${{ needs.llvm-build-for-linux.run-id }}"
+          name: llvm-linux-gnu-x86_64
+          path: ${{ github.workspace }}/llvm-install
       - name: get C-runtime binaries from glibc
         uses: actions/cache/restore@v4.2.2
         with:
@@ -192,6 +202,20 @@ jobs:
           
             mkdir bin && pushd $_
               cp "${{ github.workspace }}/toolchain/target/toolchain.jar" .
+              mkdir -p llvm/bin && pushd $_
+                cp "${{ github.workspace }}/llvm-install/bin/lld" l.
+              popd
+              mkdir llvm/lib && pushd $_
+                cp "${{ github.workspace }}/llvm-install/lib/libLLVM.so.$LLVM_MAJOR_VERSION.$LLVM_MINOR_VERSION" .
+                ln -s "libLLVM.so.$LLVM_MAJOR_VERSION.$LLVM_MINOR_VERSION" "libLLVM-$LLVM_MAJOR_VERSION.so"
+                ln -s "libLLVM.so.$LLVM_MAJOR_VERSION.$LLVM_MINOR_VERSION" "libLLVM.so"
+                cp "${{ github.workspace }}/llvm-install/lib/libLTO.so.$LLVM_MAJOR_VERSION.$LLVM_MINOR_VERSION" .
+                ln -s "libLTO.so.$LLVM_MAJOR_VERSION.$LLVM_MINOR_VERSION" "libLTO-$LLVM_MAJOR_VERSION.so"
+                ln -s "libLTO.so.$LLVM_MAJOR_VERSION.$LLVM_MINOR_VERSION" "libLTO.so"
+                cp "${{ github.workspace }}/llvm-install/lib/libRemarks.so.$LLVM_MAJOR_VERSION.$LLVM_MINOR_VERSION" .
+                ln -s "libRemarks.so.$LLVM_MAJOR_VERSION.$LLVM_MINOR_VERSION" "libRemarks.so"
+              popd
+              cp -r "${{ github.workspace }}/llvm-install/share" llvm/share
             popd
             cp -r "${{ github.workspace }}/stdlib" .
             cp -ar "${{ github.workspace }}/dist/linux/all/." .
@@ -217,7 +241,7 @@ jobs:
                 cp "${{ github.workspace }}/glibc-build/csu/Scrt1.o" .
                 cp "${{ github.workspace }}/glibc-build/libc.so" .
               popd  
-            popd
+            popd  
           popd
           tar --create \
             --directory=tarball-root \
@@ -238,8 +262,6 @@ jobs:
           path: "${{ steps.tarball.outputs.tarball_path }}"
   llvm-build-for-windows:
     uses: ./.github/workflows/build-llvm-windows.yaml
-  llvm-build-for-linux:
-    uses: ./.github/workflows/build-llvm-linux.yaml
   windows-distributables:
     name: Windows distributable archive
     runs-on: windows-2022
@@ -271,15 +293,19 @@ jobs:
           run-id: "${{ needs.llvm-build-for-windows.run-id }}"
           name: llvm-windows-x86_64
           path: ${{ github.workspace }}/llvm-install
-      - name: prepare zip
+      - name: build distributable archive
+        id: pack-zip
         shell: pwsh
         run: |
           New-Item -Type Directory -Name "archive-root"
           
           # first extract the linux tarball. It doesn't come with much linux-specific stuff, so we can reuse all the
           # code for building it
-          tar --directory archive-root -xf "${{ needs.linux-distributables.outputs.tarball-filename }}"
+          tar --no-same-owner --no-same-permissions --directory archive-root -xf "${{ needs.linux-distributables.outputs.tarball-filename }}"
+          chown -R archive-root
+          chmod -R u+w archive-root
           Remove-Item "archive-root/configure.sh" # this one is linux specific
+          Remove-Item "archive-root/bin/llvm" -Recurse # this one is linux specific
           
           New-Item -Type Directory -Path "archive-root/llvm" -Name "bin"
           # the LLVM distribution for windows builds THE WHOLE thing. This is needed for development.
@@ -293,10 +319,7 @@ jobs:
 
           # redistribute JRE
           Move-Item -Path "zulu-jre/jre" "archive-root/jre"
-      - name: pack zip
-        id: pack-zip
-        shell: pwsh
-        run: |
+
           Get-ChildItem -Path "archive-root" | Compress-Archive -DestinationPath "emerge-toolchain.zip"
           $hash = (Get-FileHash -Algorithm SHA256 "emerge-toolchain.zip").Hash
           Add-Content -Path "$Env:GITHUB_OUTPUT" -Value "sha256=$hash"

dist/linux/all/configure.sh

@@ -1,12 +1,6 @@
 #!/bin/bash
 set -e
 SELFDIR="$( realpath "$( dirname "${BASH_SOURCE[0]}" )" )"
-LLC="$(realpath "$(which llc-20)")"
-LLVM_DIR="${LLC%/bin/llc}"
-echo "Using LLVM installation in $LLVM_DIR"
-LLVM_DIR_FOR_SED=$(echo "$LLVM_DIR" | sed 's/\//\\\//g')
-
-sed --regexp-extended --in-place 's/llvm-installation-directory: \~/llvm-installation-directory: "'$LLVM_DIR_FOR_SED'"/' "$SELFDIR/toolchain-config.yml"
 
 jre_link="$SELFDIR/jre"
 if [[ ! -e "$jre_link" ]]

dist/linux/all/toolchain-config.yml

@@ -8,7 +8,7 @@ backends:
     ffi-c-sources: backends/native/emerge-ffi-c
     libc-sources: backends/linux-gnu/emerge-linux-libc
     platform-sources: backends/linux-gnu/emerge-platform-linux
-    llvm-installation-directory: ~
+    llvm-installation-directory: bin/llvm
     static-libs:
       crtbeginS: backends/x86_64-pc-linux-gnu/lib/crtbeginS.o
       crtendS: backends/x86_64-pc-linux-gnu/lib/crtendS.o