Skip to content

Commit 49ab5e6

Browse files
committed
Update.
1 parent 3bf8446 commit 49ab5e6

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.github/workflows/libcxx.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: C/C++ CI
1+
name: LibCXX builds
22

33
on: [push]
44

@@ -11,7 +11,6 @@ jobs:
1111
# - libcxx-ubuntu18.04-clang8-cxx03
1212
# - libcxx-ubuntu18.04-clang8-cxx11
1313
- libcxx-win2019-clang-cxx11
14-
# - libcxx-win2019-msvc-cxx11
1514
# - libcxx-macos10.14-xcode11-cxx11
1615
include:
1716
- name: libcxx-ubuntu18.04-clang8-cxx03
@@ -29,11 +28,6 @@ jobs:
2928
compiler: clang
3029
compiler-version: 8
3130
cxx-std: c++11
32-
- name: libcxx-win2019-msvc-cxx11
33-
os: windows-2019
34-
compiler: msvc
35-
compiler-version: xx
36-
cxx-std: c++11
3731
- name: libcxx-macos10.14-xcode11-cxx11
3832
os: macos-10.14
3933
compiler: xcode
@@ -49,14 +43,15 @@ jobs:
4943
shell: bash
5044
run: .github/workflows/utils/install_deps.sh ${{ runner.os }} ${{ matrix.compiler }} ${{ matrix.compiler-version }}
5145
- name: configure
52-
run: >-
53-
mkdir build &&
54-
cd build &&
55-
cmake -GNinja
56-
-DLLVM_FORCE_BUILD_RUNTIME=ON
57-
-DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi;libunwind"
58-
-DLLVM_LIT_ARGS="-sv --show-unsupported --show-xfail --param=std=${{ matrix.cxx-std }}"
59-
../llvm
46+
shell: bash
47+
run: |
48+
echo $PATH
49+
mkdir build
50+
cd build
51+
cmake -GNinja \
52+
-DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi;libunwind" \
53+
-DLLVM_LIT_ARGS="-sv --show-unsupported --show-xfail --param=std=${{ matrix.cxx-std }}" \
54+
../llvm
6055
- name: build libcxxabi
6156
run: ninja -C build cxxabi
6257
- name: build libcxxabi
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# Powershell script
2+
23
iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
34
scoop install ninja
45
scoop install llvm
6+
57
.\.github\workflows\utils\vs_setup.bat -arch=amd64
8+
9+
# Remove link.exe from git-bash, as it conflicts with msvc link.exe...
10+
del c:\PROGRA~1\Git\usr\bin\link.exe
11+
612
echo "::set-env name=CC::clang-cl"
713
echo "::set-env name=CXX::clang-cl"

0 commit comments

Comments
 (0)