Fix liblo tests

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Dec 23, 2023 · 0e5a7c2 · 0e5a7c2
1 parent 3452bad
commit 0e5a7c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
@@ -418,13 +418,16 @@ if [ "${MACOS}" -eq 1 ]; then
     if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
         LIBLO_EXTRAFLAGS+=" ac_cv_c_bigendian=universal"
     fi
+# use of wrong macro, should be _WIN32
+elif [ "${MACOS}" -eq 1 ]; then
+    export EXTRA_CFLAGS="-DWIN32"
 fi
 
 download liblo "${LIBLO_VERSION}" "${LIBLO_URL}"
 build_autoconf liblo "${LIBLO_VERSION}" "${LIBLO_EXTRAFLAGS}"
 
 # FIXME tests fail on macOS
-if [ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ] && [ "${MACOS}" -eq 0 ]; then
+if ([ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ]) && [ "${MACOS}" -eq 0 ]; then
     run_make liblo "${LIBLO_VERSION}" check
 fi
 

diff --git a/setup/env.sh b/setup/env.sh
@@ -65,7 +65,7 @@ if [ -z "${PAWPAW_SKIP_LTO}" ] || [ "${PAWPAW_SKIP_LTO}" -eq 0 ]; then
     PAWPAW_PREFIX+="-lto"
 fi
 
-if [ -n "${PAWPAW_NOSIMD}" ] && [ "${PAWPAW_NOSIMD}" -ne 0 ]; then
+if [ -n "${PAWPAW_NOSIMD}" ] && [ "${PAWPAW_NOSIMD}" -eq 1 ]; then
     PAWPAW_BUILDDIR+="-nosimd"
     PAWPAW_PREFIX+="-nosimd"
 fi