Build the executables statically in release mode on Linux

adonis0147 · May 30, 2024 · 9d144e5 · 9d144e5
1 parent 23f2793
commit 9d144e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/ci_meson.yml b/.github/workflows/ci_meson.yml
@@ -6,13 +6,13 @@ on:
 
 jobs:
   linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
         fetch-depth: 0
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - run: pip install meson ninja
@@ -26,11 +26,11 @@ jobs:
   macos:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
         fetch-depth: 0
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - run: brew install gcc

diff --git a/meson.build b/meson.build
@@ -34,9 +34,15 @@ flags += ['-Werror', '-Wall', '-Wextra', '-Wpedantic']
 
 link_flags = []
 
-if (build_type.startswith('debug') and compiler == 'gcc')
+if build_type.startswith('debug')
     flags += ['-fsanitize=address', '-fno-omit-frame-pointer']
-    link_flags += ['-Wl,-Bstatic', '-lasan', '-Wl,-Bdynamic']
+    if host_machine.system() == 'linux'
+        link_flags += ['-Wl,-Bstatic', '-lasan', '-Wl,-Bdynamic']
+    elif host_machine.system() == 'darwin'
+        link_flags += ['-fsanitize=address']
+    endif
+elif build_type.startswith('release') and host_machine.system() == 'linux'
+    link_flags += ['-static']
 endif
 
 executable(