diff --git a/Dockerfile.dev b/Dockerfile.dev index 789edea..d802748 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -163,16 +163,8 @@ RUN cd test && \ COPY build-openmp.sh ./ RUN ./build-openmp.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS -# OpenMP on windows only supports x86. RUN cd test && \ for arch in $TOOLCHAIN_ARCHS; do \ - case $arch in \ - i686|x86_64) \ - ;; \ - *) \ - continue \ - ;; \ - esac && \ for test in hello-omp; do \ $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -fopenmp=libomp || exit 1; \ done; \ diff --git a/build-openmp.sh b/build-openmp.sh index 26fabcd..b912a72 100755 --- a/build-openmp.sh +++ b/build-openmp.sh @@ -72,15 +72,9 @@ fi for arch in $ARCHS; do CMAKEFLAGS="" case $arch in - i686) - ;; x86_64) CMAKEFLAGS="$CMAKEFLAGS -DLIBOMP_ASMFLAGS=-m64" ;; - *) - # Not supported - continue - ;; esac [ -z "$CLEAN" ] || rm -rf build-$arch diff --git a/run-tests.sh b/run-tests.sh index 808a6bf..9b757e5 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -114,14 +114,14 @@ for arch in $ARCHS; do COPY="$COPY_ARMV7" NATIVE="$NATIVE_ARMV7" unset HAVE_SANITIZERS - unset HAVE_OPENMP + HAVE_OPENMP=1 ;; aarch64) RUN="$RUN_AARCH64" COPY="$COPY_AARCH64" NATIVE="$NATIVE_AARCH64" unset HAVE_SANITIZERS - unset HAVE_OPENMP + HAVE_OPENMP=1 ;; esac