fixup! fixup! Linux port misc

Author: Hello71

.github/workflows/build-linux.yml

@@ -17,27 +17,15 @@ jobs:
         compiler: [gcc, clang]
         include:
           - buildtype: debug
-            meson_args: -Dvpdebug=true
-            optimization: g
+            debug: true
+            meson_args: -Dvpdebug=true -Doptimization=g
 
           - buildtype: release
-            meson_args: -Dunity=on
-            optimization: 3
-
-          - compiler: gcc
-            meson_env: CXX="g++ -m32"
+            debug: false
+            meson_args: -Ddebug=false -Dunity=on -Doptimization=3 -Db_lto=true
 
           - compiler: clang
             packages: lld
-            meson_env: CXX="clang++ -m32" CXX_LD=lld
-
-          - buildtype: release
-            compiler: gcc
-            lto_args: -flto=auto
-
-          - buildtype: release
-            compiler: clang
-            lto_args: -flto=thin
 
     steps:
     - uses: actions/checkout@v3
@@ -52,10 +40,6 @@ jobs:
       run: >
         meson setup
         --cross-file meson-${{matrix.compiler}}.txt
-        -Dbuildtype=${{matrix.buildtype}}
-        -Doptimization=${{matrix.optimization}}
-        -Dcpp_args="${{matrix.lto_args}}"
-        -Dcpp_link_args="${{matrix.lto_args}}"
         -Dwerror=true
         ${{matrix.meson_args}}
         build || {
@@ -69,7 +53,7 @@ jobs:
       run: meson compile -C build -v
 
     - name: Package
-      run: ninja -C build -v package
+      run: meson compile -C build -v package
 
     - name: Upload package
       uses: actions/upload-artifact@v4

meson-clang.txt

@@ -1,6 +1,7 @@
 [binaries]
 c = ['clang', '-m32']
 cpp = ['clang++', '-m32']
+cpp_ld = 'lld'
 strip = 'strip'
 
 [host_machine]

meson.build

@@ -64,7 +64,7 @@ add_project_arguments(cpp_args, language: 'cpp')
 add_project_link_arguments(cpp_args + cpp.get_supported_link_arguments(cpp_try_link_args), language: 'cpp')
 
 if host_machine.system() == 'linux'
-  if cpp.has_header('string', args: ['-stdlib=libc++'])
+  if cpp.has_header_symbol('version', '_LIBCPP_VERSION', args: ['-stdlib=libc++'])
     libcxx = declare_dependency(compile_args: ['-stdlib=libc++'], link_args: ['-stdlib=libc++'])
   elif cpp.get_id() == 'gcc'
     libcxx_inc = get_option('libcxx_inc')