ci: fix the `g++` build and the `alpine-musl` task

pull/12012/head
Delyan Angelov 2021-09-28 15:23:16 +03:00
parent 9bf6d57032
commit 3467ab1551
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 19 additions and 14 deletions

View File

@ -257,18 +257,20 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Build V - name: Show Environment
run: |
make CC=clang
- name: Show PWD and Environment
run: | run: |
echo "PWD:" echo "PWD:"
pwd pwd
echo "ENVIRONMENT" echo "ENVIRONMENT:"
env env
echo "C Compiler:"
gcc --version
- name: Build V
run: CC=gcc make
- name: Test V fixed tests - name: Test V fixed tests
run: | run: ./v -silent test-self
./v -silent test-self
macos: macos:
needs: no-scheduling needs: no-scheduling

View File

@ -552,16 +552,19 @@ fn (mut v Builder) cc() {
v.setup_output_name() v.setup_output_name()
if v.pref.os != .windows && ccompiler.contains('++') { if v.pref.os != .windows && ccompiler.contains('++') {
cpp_atomic_h_path := '${@VEXEROOT}/thirdparty/stdatomic/nix/cpp/atomic.h'
if !os.exists(cpp_atomic_h_path) {
for file in v.parsed_files { for file in v.parsed_files {
if file.imports.any(it.mod.contains('sync')) { if file.imports.any(it.mod.contains('sync')) {
x := @VEXE + ' run ' + $if trace_stdatomic_gen {
os.join_path(@VEXEROOT, 'thirdparty', 'stdatomic', 'nix', 'cpp', 'gen.v') + eprintln('> creating $cpp_atomic_h_path ...')
' ' + ccompiler }
os.execute(x) os.execute('$vexe run ${@VEXEROOT}/thirdparty/stdatomic/nix/cpp/gen.v $ccompiler')
break break
} }
} }
} }
}
// //
mut libs := []string{} // builtin.o os.o http.o etc mut libs := []string{} // builtin.o os.o http.o etc
if v.pref.build_mode == .build_module { if v.pref.build_mode == .build_module {