From cd08c351d6c20a09d47e94e091d8b5d44b8e5d46 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 1 Oct 2025 18:40:22 +0200 Subject: [PATCH 1/2] reinstate symlink test for omp.h --- recipe/meta.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d912058a..ab2aeca3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,13 +4,6 @@ {% set openmp_ver = "4.5" %} {% set clang_major = version.split(".")[0]|int %} -{% set tail_version = version.split(".")[-1] %} -# for rc/dev builds we intentionally don't pull in half-baked compilers -# from conda-forge/label/llvm_{rc,dev}, so we need to adjust down to previous version -{% set clang_major = clang_major - 1 if tail_version|trim("0123456789") in ("rc", "dev") else clang_major %} # [linux] -# on osx we need to use cxx_compiler_version regardless; if-condition to shut up linter -{% set clang_major = 0 if cxx_compiler_version is undefined else cxx_compiler_version.split(".")[0]|int %} # [osx] - {% set clang_test_version = "19" %} package: @@ -29,7 +22,7 @@ source: - patches/0001-link-libomp-to-compiler-rt-on-osx-arm.patch build: - number: 1 + number: 2 requirements: build: @@ -83,6 +76,7 @@ outputs: - test -f $PREFIX/include/omp.h # [unix] - if not exist %LIBRARY_INC%\omp.h exit 1 # [win] # clang-specific one (symlink on unix; copies on win, see install_pkg.bat) + - test -f $PREFIX/lib/clang/{{ clang_test_version }}/include/omp.h # [unix] {% for ver in range(18, clang_major + 1) %} - if not exist %LIBRARY_LIB%\clang\{{ ver }}\include\omp.h exit 1 # [win] {% endfor %} From b0b5b295e73a0800b3129a858ba88906dd1d42f5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 1 Oct 2025 19:17:04 +0200 Subject: [PATCH 2/2] shorten very long line in test invocation --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ab2aeca3..999286af 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -95,8 +95,9 @@ outputs: - if not exist %LIBRARY_LIB%\libomp.lib exit 1 # [win] # compilation test - - export LNK_XTRA="-Wl,--allow-shlib-undefined" # [linux] - - $PREFIX/bin/clang-{{ clang_test_version }} -v -fopenmp -I$PREFIX/include -L$PREFIX/lib -Wl,-rpath,$PREFIX/lib $LNK_XTRA omp_hello.c -o omp_hello # [unix] + - export LNK="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" # [unix] + - export LNK="${LNK} -Wl,--allow-shlib-undefined" # [linux] + - $PREFIX/bin/clang-{{ clang_test_version }} -v -fopenmp -I$PREFIX/include $LNK omp_hello.c -o omp_hello # [unix] - '%LIBRARY_BIN%\clang-{{ clang_test_version }} -v -fopenmp -I%LIBRARY_INC% -L%LIBRARY_LIB% omp_hello.c -o omp_hello.exe' # [win] - ./omp_hello # [unix] - '%cd%\omp_hello.exe' # [win]