Skip to content

Commit a4b12f6

Browse files
committed
Reuse build and install directories.
1 parent 16dac53 commit a4b12f6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/libc-fullbuild-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ jobs:
9898
run: |
9999
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
100100
echo "build-install-dir=${{ github.workspace }}/install" >> "$GITHUB_OUTPUT"
101-
echo "build-baremetal-output-dir=${{ github.workspace }}/build_baremetal" >> "$GITHUB_OUTPUT"
102-
echo "build-baremetal-install-dir=${{ github.workspace }}/install_baremetal" >> "$GITHUB_OUTPUT"
103101
104102
# Configure libc fullbuild with scudo.
105103
# Use MinSizeRel to reduce the size of the build.
@@ -147,17 +145,18 @@ jobs:
147145
--parallel
148146
--target check-libc
149147
150-
- name: Configure and build for baremetal
148+
- name: Configure baremetal
151149
if: ${{ matrix.enable_baremetal_build == "ON" }}
152150
run: |
153151
export RUNTIMES="libc"
154-
cmake -B ${{ steps.strings.outputs.build-baremetal-output-dir }} \
152+
153+
cmake -B ${{ steps.strings.outputs.build-output-dir }} \
155154
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \
156155
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
157156
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
158157
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
159158
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
160-
-DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.build-baremetal-install-dir }} \
159+
-DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.build-install-dir }} \
161160
-DLLVM_RUNTIME_TARGETS=${{ matrix.target }} \
162161
-DLLVM_ENABLE_RUNTIMES="$RUNTIMES" \
163162
-DLLVM_LIBC_FULL_BUILD=ON \
@@ -170,10 +169,11 @@ jobs:
170169
-DCMAKE_ASM_COMPILER_TARGET=armv6m-none-abi \
171170
-DCMAKE_C_FLAGS=-mfloat-abi=soft \
172171
-DCMAKE_CXX_FLAGS=-mfloat-abi=soft
172+
173173
- name: Build baremetal
174174
if: ${{ matrix.enable_baremetal_build == "ON" }}
175175
run: >
176176
cmake
177-
--build ${{ steps.strings.outputs.build-baremetal-output-dir }}
177+
--build ${{ steps.strings.outputs.build-output-dir }}
178178
--parallel
179179
--target install

0 commit comments

Comments
 (0)