fix install-path on windows

conda-forge · Jul 31, 2023 · 19ebb9f · 19ebb9f
1 parent e68c5b3
commit 19ebb9f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 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"

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,7 +47,8 @@ outputs:
       run_constrained:
         - compiler-rt {{ version }}
     files:
-      - lib/clang/{{ prod_ver }}/lib
+      - lib/clang/{{ prod_ver }}/lib            # [unix]
+      - Library/lib/clang/{{ prod_ver }}/lib    # [win]
     test:
       commands:
         - echo {{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}
@@ -66,9 +67,9 @@ 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]
+      - 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