Skip to content

Commit e3790ac

Browse files
committed
test: Set the NATIVE= variable automatically in test-libcxx-module.sh
1 parent c5d169f commit e3790ac

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ jobs:
266266
./build-all.sh $(pwd)/install/llvm-mingw --disable-clang-tools-extra --disable-lldb $ARGS
267267
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
268268
./copy-msys-dependencies.sh $(pwd)/install/llvm-mingw ${{matrix.sys}}
269-
NATIVE=1 ./test-libcxx-module.sh $(pwd)/install/llvm-mingw
269+
./test-libcxx-module.sh $(pwd)/install/llvm-mingw
270270
./run-tests.sh $(pwd)/install/llvm-mingw
271271
cd install
272272
NAME=llvm-mingw-$TAG-ucrt-msys2-${{matrix.sys}}
@@ -362,7 +362,7 @@ jobs:
362362
- uses: actions/checkout@v4
363363
- name: Run tests
364364
run: |
365-
NATIVE=1 ./test-libcxx-module.sh /llvm-mingw
365+
./test-libcxx-module.sh /llvm-mingw
366366
./run-tests.sh /llvm-mingw
367367
./run-lldb-tests.sh /llvm-mingw
368368

test-libcxx-module.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ export PATH=$PREFIX/bin:$PATH
2626

2727
: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
2828

29+
case $(uname) in
30+
MINGW*|MSYS*)
31+
NATIVE=1
32+
;;
33+
*)
34+
esac
35+
2936
for arch in $ARCHS; do
3037
# TODO: This should ideally use "$CXX -print-file-name=libc++.modules.json", then parse the json to find the relevant cppm file and include directory.
3138
$arch-w64-mingw32-clang++ -I$PREFIX/share/libc++/v1 -std=gnu++23 -Wno-reserved-module-identifier -x c++-module -fmodule-output=std.pcm -o std.cppm.obj -c $PREFIX/share/libc++/v1/std.cppm

0 commit comments

Comments
 (0)