bootstrap libcxx-devel as a wrapper around libcxx

conda-forge · Aug 26, 2024 · 74204e6 · 74204e6
1 parent 8fb9aec
commit 74204e6
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -22,7 +22,7 @@ source:
       - patches/0004-Work-around-stray-nostdlib-flags-causing-errors-with.patch
 
 build:
-  number: 5
+  number: 6
   skip: true  # [win]
   skip: true  # [ppc64le or aarch64]
 
@@ -50,13 +50,14 @@ outputs:
       run_exports:                                      # [hardening == "debug"]
         # packages built with hardened lib must not be installable without extra label
         - libcxx =*=debug*                              # [hardening == "debug"]
-    files:
-      - include/c++                 # [unix]
-      - lib/libc++.a                # [unix]
-      - lib/libc++experimental.*    # [unix]
-      - Library/include/c++         # [win]
-      - Library/lib/c++*.lib        # [win]
-      - Library/lib/libc++*.lib     # [win]
+    # temporarily still in libcxx, until we update compiler stack w.r.t. libcxx-devel
+    # files:
+    #   - include/c++                 # [unix]
+    #   - lib/libc++.a                # [unix]
+    #   - lib/libc++experimental.*    # [unix]
+    #   - Library/include/c++         # [win]
+    #   - Library/lib/c++*.lib        # [win]
+    #   - Library/lib/libc++*.lib     # [win]
     requirements:
       host:
         - {{ pin_subpackage("libcxx", exact=True) }}
@@ -131,6 +132,13 @@ outputs:
       - lib/libc++.dylib            # [osx]
       - lib/libc++.*.dylib          # [osx]
       - Library/bin/c++*.dll        # [win]
+    # temporarily still in libcxx, until we update compiler stack w.r.t. libcxx-devel
+      - include/c++                 # [unix]
+      - lib/libc++.a                # [unix]
+      - lib/libc++experimental.*    # [unix]
+      - Library/include/c++         # [win]
+      - Library/lib/c++*.lib        # [win]
+      - Library/lib/libc++*.lib     # [win]
     requirements:
       build:
         - {{ stdlib('c') }}
@@ -148,9 +156,9 @@ outputs:
         - test -f $PREFIX/lib/libc++.so                 # [linux]
         - test -f $PREFIX/lib/libc++.dylib              # [osx]
         # absence of static libs & headers
-        - test ! -f $PREFIX/lib/libc++.a                # [unix]
-        - test ! -f $PREFIX/lib/libc++experimental.a    # [unix]
-        - test ! -d $PREFIX/include/c++                 # [unix]
+        # - test ! -f $PREFIX/lib/libc++.a                # [unix]
+        # - test ! -f $PREFIX/lib/libc++experimental.a    # [unix]
+        # - test ! -d $PREFIX/include/c++                 # [unix]
 
   - name: libcxxabi
     build: