From 99fdcd2e712be9e6f06a209b18976f14f33b491f Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Wed, 29 Dec 2021 21:32:30 +0200
Subject: [PATCH] v.builder: fix `v -cc tcc -no-retry-compilation build-module
 vlib/sync/stdatomic`

---
 .github/workflows/ci.yml | 20 +++++++++++++++-----
 vlib/v/builder/cc.v      |  6 +++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b6310d247b..c377462845 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,6 +81,7 @@ jobs:
           ./v doctor
       - name: Verify `v test` works
         run: |
+          echo $VFLAGS
           ./v cmd/tools/test_if_v_test_system_works.v
           ./cmd/tools/test_if_v_test_system_works
       - name: Self tests
@@ -111,6 +112,7 @@ jobs:
         run: cd cmd/tools/fast && ../../../v fast.v && ./fast
       - name: V self compilation with -usecache
         run: |
+          unset VFLAGS
           ./v -usecache examples/hello_world.v && examples/hello_world
           ./v  -o v2 -usecache cmd/v
           ./v2 -o v3 -usecache cmd/v
@@ -296,6 +298,7 @@ jobs:
       ##      run: ./v -o hi.js examples/hello_v_js.v && node hi.js
       - name: Verify `v test` works
         run: |
+          echo $VFLAGS
           ./v cmd/tools/test_if_v_test_system_works.v
           ./cmd/tools/test_if_v_test_system_works
 
@@ -377,13 +380,15 @@ jobs:
         run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v
       - name: V self compilation with -usecache
         run: |
-             ./v -usecache examples/hello_world.v && examples/hello_world
-             ./v  -o v2     -usecache cmd/v
-             ./v2 -o v3     -usecache cmd/v
-             ./v3 version
-             ./v3 -o tetris -usecache examples/tetris/tetris.v
+          unset VFLAGS
+          ./v -usecache examples/hello_world.v && examples/hello_world
+          ./v  -o v2     -usecache cmd/v
+          ./v2 -o v3     -usecache cmd/v
+          ./v3 version
+          ./v3 -o tetris -usecache examples/tetris/tetris.v
       - name: Verify `v test` works
         run: |
+          echo $VFLAGS
           ./v cmd/tools/test_if_v_test_system_works.v
           ./cmd/tools/test_if_v_test_system_works
       - name: Self tests
@@ -468,6 +473,7 @@ jobs:
         run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v
       - name: v self compilation with -usecache
         run: |
+          unset VFLAGS
           ./v -usecache examples/hello_world.v && examples/hello_world
           ./v  -o v2     -usecache cmd/v
           ./v2 -o v3     -usecache cmd/v
@@ -475,6 +481,7 @@ jobs:
           ./v3 -o tetris -usecache examples/tetris/tetris.v
       - name: Verify `v test` works
         run: |
+          echo $VFLAGS
           ./v cmd/tools/test_if_v_test_system_works.v
           ./cmd/tools/test_if_v_test_system_works
       - name: Self tests
@@ -551,6 +558,7 @@ jobs:
           echo $VFLAGS && make -j4 && ./v -cg -o v cmd/v
       - name: Verify `v test` works
         run: |
+          echo $VFLAGS
           ./v cmd/tools/test_if_v_test_system_works.v
           ./cmd/tools/test_if_v_test_system_works
       - name: Test V fixed tests
@@ -607,6 +615,7 @@ jobs:
           ./v doctor
       - name: Verify `v test` works
         run: |
+          echo $VFLAGS
           ./v cmd/tools/test_if_v_test_system_works.v
           ./cmd/tools/test_if_v_test_system_works
       - name: Self tests
@@ -649,6 +658,7 @@ jobs:
           ./v doctor
       - name: Verify `v test` works
         run: |
+          echo $VFLAGS
           ./v cmd/tools/test_if_v_test_system_works.v
           ./cmd/tools/test_if_v_test_system_works
       - name: Self tests
diff --git a/vlib/v/builder/cc.v b/vlib/v/builder/cc.v
index 89929fe4e3..afe307c9c6 100644
--- a/vlib/v/builder/cc.v
+++ b/vlib/v/builder/cc.v
@@ -390,7 +390,11 @@ fn (v &Builder) all_args(ccoptions CcompilerOptions) []string {
 	all << ccoptions.pre_args
 	all << ccoptions.source_args
 	all << ccoptions.post_args
-	all << ccoptions.linker_flags
+	// in `build-mode`, we do not need -lxyz flags, since we are
+	// building an (.o) object file, that will be linked later.
+	if v.pref.build_mode != .build_module {
+		all << ccoptions.linker_flags
+	}
 	all << ccoptions.env_ldflags
 	return all
 }