Skip to content

Commit 4e6081d

Browse files
committed
Cirrus CI: Adapt to FreeBSD bumping LLVM from 15 to 19
1 parent 9296fd6 commit 4e6081d

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

.cirrus.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ packaging_steps_template: &PACKAGING_STEPS_TEMPLATE
7676
# Run dynamic-compile integration test
7777
run_dynamic_compile_integration_test_script: |
7878
cd $CIRRUS_WORKING_DIR/..
79-
# FreeBSD's LLVM 15 is too old (need LLVM 18+ for dynamic-compile)
80-
if [[ "$CI_OS" != "freebsd" ]]; then
81-
installed/bin/ldc2 -enable-dynamic-compile -run $CIRRUS_WORKING_DIR/tests/dynamiccompile/array.d
82-
fi
79+
installed/bin/ldc2 -enable-dynamic-compile -run $CIRRUS_WORKING_DIR/tests/dynamiccompile/array.d
8380
# Run ImportC integration test
8481
run_importC_integration_test_script: |
8582
cd $CIRRUS_WORKING_DIR/..
@@ -224,7 +221,7 @@ task:
224221
install_prerequisites_script: |
225222
cd $CIRRUS_WORKING_DIR/..
226223
sysctl -n hw.ncpu
227-
pkg install -y git cmake ninja gmake llvm bash gtar 7-zip ldc
224+
pkg install -y git cmake ninja gmake llvm bash gtar 7-zip ldc zstd
228225
python3 --version
229226
python3 -m ensurepip
230227
clone_submodules_early_script: |
@@ -238,8 +235,10 @@ task:
238235
cmake -G Ninja $CIRRUS_WORKING_DIR \
239236
-DCMAKE_BUILD_TYPE=Release \
240237
-DD_COMPILER=ldmd2 \
241-
-DBUILD_SHARED_LIBS=OFF \
242-
-DBUILD_LTO_LIBS=ON
238+
-DLDC_LINK_MANUALLY=OFF \
239+
-DBUILD_LTO_LIBS=ON \
240+
-DLDC_WITH_LLLD=OFF \
241+
-DCMAKE_EXE_LINKER_FLAGS="-lpthread"
243242
ninja -j$PARALLELISM
244243
bin/ldc2 -version
245244
<< : *COMMON_STEPS_TEMPLATE

0 commit comments

Comments
 (0)