Merge pull request #85 from h-vetinari/17

compiler-rt 17.0.2

conda-forge.yml

@@ -1,10 +1,9 @@
 bot:
   abi_migration_branches:
+  - 16.x
   - 15.x
-  - 14.x
 build_platform:
   osx_arm64: osx_64
-channel_priority: flexible
 conda_build:
   pkg_format: '2'
 conda_forge_output_validation: true

recipe/bld.bat

@@ -3,6 +3,13 @@
 mkdir build
 cd build
 
+:: strip off ".rcX" suffixes, which are not part of the installation path
+set PKG_VERSION=%PKG_VERSION:.rc1=%
+set PKG_VERSION=%PKG_VERSION:.rc2=%
+set PKG_VERSION=%PKG_VERSION:.rc3=%
+set PKG_VERSION=%PKG_VERSION:.rc4=%
+set PKG_VERSION=%PKG_VERSION:.rc5=%
+
 set BUILD_CONFIG=Release
 set "CC=clang-cl.exe"
 set "CXX=clang-cl.exe"
@@ -27,5 +34,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\

recipe/meta.yaml

@@ -1,13 +1,14 @@
-{% set version = "16.0.6" %}
-{% set prod_ver = '.'.join(version.split('.')[:3]) %}
+{% set version = "17.0.2" %}
+# suffixes .rc1, .rc2, etc. are removed (on unix), while .dev0 is not.
+{% set prod_ver = '.'.join(version.split('.')[:3]) if version.split(".")[-1] != "dev0" else version %}
 
 package:
   name: compiler-rt-packages
   version: {{ version }}
 
 source:
   url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz
-  sha256: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e
+  sha256: 351562b14d42fcefcbf00cc1f327680a1062bbbf67a1e1ca6acb64c473b06394
   patches:
     - patches/0001-no-code-sign.patch
     - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch
@@ -46,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:
@@ -64,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/