Skip to content

Commit 958ddf1

Browse files
FIX hot fix for musl.
1 parent 69fa53f commit 958ddf1

1 file changed

Lines changed: 18 additions & 17 deletions

File tree

.github/workflows/llvm-x86_64-unknown-linux-musl.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
BUILD_ID="${BASE_NAME}-$GITHUB_RUN_ID"
2626
2727
echo "BUILD_ID=$BUILD_ID" >> $GITHUB_ENV
28-
echo "BUILD_ID=$TAG_NAME" >> $GITHUB_ENV
28+
echo "BASE_NAME=$BASE_NAME" >> $GITHUB_ENV
2929
3030
echo "Unique ID: $BUILD_ID"
31-
echo "Base name: $TAG_NAME"
31+
echo "Base name: $BASE_NAME"
3232
3333
- name: Installing dependencies
3434
run: |
@@ -47,11 +47,13 @@ jobs:
4747
tar -xf llvm-project-17.0.6.src.tar.xz
4848
mv llvm-project-17.0.6.src llvm-project
4949
50-
mkdir -p llvm-project/llvm/build
50+
- name: Creating build directory
51+
run: |
52+
mkdir -p llvm-build
5153
52-
- name: Clean and configure build
54+
- name: Configure LLVM build
5355
run: |
54-
cmake ../CMakeLists.txt -G Ninja \
56+
cmake ../llvm-project/llvm -G Ninja \
5557
-DCMAKE_BUILD_TYPE=MinSizeRel \
5658
-DCMAKE_C_COMPILER=x86_64-unknown-linux-musl-gcc \
5759
-DCMAKE_CXX_COMPILER=x86_64-unknown-linux-musl-g++ \
@@ -61,37 +63,36 @@ jobs:
6163
-DLLVM_ENABLE_ZLIB=OFF \
6264
-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=TRUE \
6365
-DLLVM_ENABLE_LIBXML2=0 \
64-
-DCMAKE_INSTALL_PREFIX="../dist" \
66+
-DCMAKE_INSTALL_PREFIX="dist" \
6567
-DLLVM_TARGETS_TO_BUILD=X86 \
6668
-DLLVM_BUILD_TESTS=OFF \
6769
-DLLVM_BUILD_EXAMPLES=OFF \
6870
-DLLVM_INCLUDE_TESTS=OFF \
6971
-DLLVM_INCLUDE_EXAMPLES=OFF \
7072
-DLLVM_INCLUDE_DOCS=OFF
71-
working-directory: llvm-project/llvm/build
73+
working-directory: llvm-build
7274

73-
- name: Building LLVM C API
75+
- name: Building LLVM
7476
run: |
7577
ninja -j$(nproc)
76-
working-directory: llvm-project/llvm/build
78+
working-directory: llvm-build
7779

78-
- name: Installing LLVM C API
80+
- name: Installing LLVM
7981
run: |
8082
ninja install
81-
working-directory: llvm-project/llvm/build
83+
working-directory: llvm-build
8284

8385
- name: Cleaning LLVM Binaries
8486
run: |
85-
find llvm-project/llvm/dist/bin -type f -executable ! -name "llvm-config" -delete
87+
find llvm-build/dist/bin -type f -executable ! -name "llvm-config" -delete
8688
87-
- name: Cloning LLVM C API
88-
shell: bash
89+
- name: Preparing distribution files
8990
run: |
9091
mkdir -p tempDir/{lib,bin,include}
9192
92-
cp -r llvm-project/llvm/dist/lib/* tempDir/lib/
93-
cp -r llvm-project/llvm/dist/bin/* tempDir/bin/
94-
cp -r llvm-project/llvm/dist/include/* tempDir/include/
93+
cp -r llvm-build/dist/lib/* tempDir/lib/
94+
cp -r llvm-build/dist/bin/* tempDir/bin/
95+
cp -r llvm-build/dist/include/* tempDir/include/
9596
9697
- name: Packaging LLVM (LLVM Libraries, Binaries & Includes)
9798
run: |

0 commit comments

Comments
 (0)