Merge pull request #79 from h-vetinari/rc

Fix path on windows
conda-forge · Jul 31, 2023 · 5b8015d · 5b8015d
2 parents 4ec0d42 + e94a48d
commit 5b8015d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -3,6 +3,10 @@
 mkdir build
 cd build
 
+:: cut off any extensions after "XY.0.0";
+:: mainly aimed at ".rcX", which is not part of the installation path
+set PKG_VERSION=%PKG_VERSION:~0,-4%
+
 set BUILD_CONFIG=Release
 set "CC=clang-cl.exe"
 set "CXX=clang-cl.exe"
@@ -27,5 +31,9 @@ if %ERRORLEVEL% neq 0 exit 1
 cmake --install .
 if %ERRORLEVEL% neq 0 exit 1
 
+:: Also install into %PREFIX%\lib (!= %PREFIX%\Library\lib, the default on win)
+:: because compiler-rt_win-64 is noarch and needs to be installable on linux,
+:: where we don't want the "\Library"; aside from removing that directory,
+:: the paths are the same. Separation into proper outputs happens in the recipe.
 mkdir %PREFIX%\lib\clang\%PKG_VERSION%\lib\windows
 copy %INSTALL_PREFIX%\lib\windows\* %PREFIX%\lib\clang\%PKG_VERSION%\lib\windows\
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -14,7 +14,7 @@ source:
     - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build:
@@ -47,11 +47,14 @@ outputs:
       run_constrained:
         - compiler-rt {{ version }}
     files:
-      - lib/clang/{{ prod_ver }}/lib
+      - lib/clang/{{ prod_ver }}/lib    # [unix]
+      # avoid "Library\" for noarch output
+      - lib\clang\{{ prod_ver }}\lib    # [win]
     test:
       commands:
         - echo {{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}
-        - test -f $PREFIX/lib/clang/{{ prod_ver }}/lib/darwin/libclang_rt.osx.a  # [osx]
+        - test -f $PREFIX/lib/clang/{{ prod_ver }}/lib/darwin/libclang_rt.osx.a                             # [osx]
+        - if not exist %PREFIX%\lib\clang\{{ prod_ver }}\lib\windows\clang_rt.builtins-x86_64.lib exit 1    # [win]
 
   - name: compiler-rt
     requirements:
@@ -65,17 +68,19 @@ outputs:
     files:
       - lib/clang/{{ prod_ver }}/share             # [unix]
       - lib/clang/{{ prod_ver }}/include           # [unix]
-      - Library/lib/clang/{{ version }}/share     # [win]
-      - Library/lib/clang/{{ version }}/include   # [win]
-      - Library/lib/clang/{{ version }}/lib       # [win]
+      # standard windows layout for arch-specific output
+      - Library\lib\clang\{{ prod_ver }}\share     # [win]
+      - Library\lib\clang\{{ prod_ver }}\include   # [win]
+      - Library\lib\clang\{{ prod_ver }}\lib       # [win]
     test:
       # files:
       #   - test.c.in
       commands:
         # {% set NEW_TARGET="10." ~ (((MACOSX_DEPLOYMENT_TARGET|default("10.13")).split(".")[1])|int + 1) %}
         # - sed "s/@MACOSX_DEPLOYMENT_TARGET@/{{ NEW_TARGET }}/g" test.c.in > test.c
         # - clang -mmacosx-version-min={{ MACOSX_DEPLOYMENT_TARGET }} test.c  # [osx]
-        - test -f $PREFIX/lib/clang/{{ prod_ver }}/include/sanitizer/asan_interface.h  # [unix]
+        - test -f $PREFIX/lib/clang/{{ prod_ver }}/include/sanitizer/asan_interface.h                       # [unix]
+        - if not exist %LIBRARY_LIB%\clang\{{ prod_ver }}\lib\windows\clang_rt.builtins-x86_64.lib exit 1   # [win]
 
 about:
   home: http://llvm.org/