Merge pull request #75 from lazka/clang32-disable-openmp

clang32: openmp is gone

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
             ${{ matrix.prefix }}-cmake
             ${{ matrix.prefix }}-make
             ${{ matrix.prefix }}-${{ !contains(matrix.prefix, 'i686') &&  matrix.cc == 'gcc' && 'gcc-ada' || 'ninja'}}
-            ${{ matrix.prefix }}-${{ matrix.cc != 'gcc' && 'openmp' || 'ninja'}}
+            ${{ matrix.prefix }}-${{ !contains(matrix.prefix, 'i686') && matrix.cc != 'gcc' && 'openmp' || 'ninja'}}
             ${{ matrix.prefix }}-${{ matrix.cc != 'gcc' && 'lld' || 'ninja'}}
             ${{ matrix.prefix }}-${{ matrix.cc != 'gcc' && 'libc++' || 'ninja'}}
             ${{ matrix.prefix }}-${{ matrix.fc == 'gfortran' && 'gcc-fortran' || 'ninja'}}

toolchain/meson/meson_options.txt

@@ -0,0 +1,4 @@
+option('openmp',
+  type: 'boolean',
+  value: true,
+  description: 'Enable OpenMP support')

toolchain/meson/tests/meson.build

@@ -7,10 +7,12 @@ test('pch', executable('pch', 'pch.cpp', cpp_pch : 'pch/pch.hpp'))
 test('libcpp_long_double', executable('libcpp_long_double', 'libcpp_long_double.cpp'))
 
 
-openmp = dependency('openmp')
-env = environment()
-env.set('OMP_NUM_THREADS', '1')
-test('openmp_for_if', executable('openmp_for_if', 'openmp_for_if.c', dependencies : [openmp]), env : env)
+openmp = dependency('openmp', required: get_option('openmp'))
+if openmp.found()
+    env = environment()
+    env.set('OMP_NUM_THREADS', '1')
+    test('openmp_for_if', executable('openmp_for_if', 'openmp_for_if.c', dependencies : [openmp]), env : env)
+endif
 test('pow', executable('pow', 'pow.c', c_args: ['-fno-builtin', '-fno-strict-aliasing']))
 
 windres_res = import('windows').compile_resources('windres.rc')

toolchain/test.sh

@@ -2,8 +2,13 @@
 
 set -e
 
+options=()
+if [[ "$MSYSTEM" == "CLANG32" ]]; then
+    options+=("-Dopenmp=false")
+fi
+
 cd meson
-meson setup _build --werror
+meson setup "${options[@]}" _build --werror
 meson compile -C _build
 meson test -C _build
 cd ..