Merge pull request #32 from beckermr/sysroot-deps

ENH add extra sysroot deps to mark builds

recipe/conda_build_config.yaml

@@ -27,7 +27,7 @@ ctng_vendor:
 #ctng_duma:
 #  - 2.5.15
 ctng_gcc_build_number:
-  - 8
+  - 9
 ctng_gmp:
   - 6.1.2
 ctng_isl:

recipe/install-binutils.sh

@@ -7,6 +7,12 @@ pushd ${SRC_DIR}/.build/${CHOST}/build/build-binutils-host-*
   make prefix=${PREFIX} install-strip
 popd
 
+# clean up the sysroot
+for tool in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib readelf stri; do
+  rm -rf $PREFIX/$CHOST/bin/$tool
+  ln -s $PREFIX/bin/$CHOST-$tool $PREFIX/$CHOST/bin/$tool || true;
+done
+
 # Copy the liblto_plugin.so from the build tree. This is something of a hack and, on OSes other
 # than the build OS, may cause segfaults. This plugin is used by gcc-ar, gcc-as and gcc-ranlib.
 pushd ${SRC_DIR}/.build/*-*-*-*/build/build-cc-gcc-core-pass-2/gcc/

recipe/meta.yaml

@@ -106,6 +106,8 @@ outputs:
       run:
         # For cpp and crt{i,n}.o
         - {{ pin_subpackage("gcc_impl_" ~ ctng_target_platform, exact=True) }}
+        # not needed due to pinning above but marks this build as using the new sysroots
+        - sysroot_{{ ctng_target_platform }}
     run_exports:
       # impose this requirement across the build/host boundary
       strong:
@@ -146,6 +148,8 @@ outputs:
         - {{ pin_subpackage("gcc_impl_" ~ ctng_target_platform, exact=True) }}
       host:
         - {{ pin_subpackage("gcc_impl_" ~ ctng_target_platform, exact=True) }}
+        # not needed due to pinning above but marks this build as using the new sysroots
+        - sysroot_{{ ctng_target_platform }}
       run:
         # For cpp and crt{i,n}.o
         - gcc_impl_{{ ctng_target_platform }} >=7.2.0
@@ -187,13 +191,15 @@ outputs:
       missing_dso_whitelist:
         - "*"
     requirements:
+      run:
+        - sysroot_{{ ctng_target_platform }}
       run_constrained:
         - gcc_impl_{{ ctng_target_platform }} {{ ctng_gcc }}.*
         - gfortran_impl_{{ ctng_target_platform }} {{ ctng_gcc }}.*
     test:
       commands:
-        - test -f ${PREFIX}/{{ ctng_cpu_arch }}*/bin/ar
-        - test -f ${PREFIX}/{{ ctng_cpu_arch }}*/bin/ld
+        - test -f ${PREFIX}/{{ ctng_cpu_arch }}-{{ ctng_vendor }}-linux-gnu/bin/ar
+        - test -f ${PREFIX}/{{ ctng_cpu_arch }}-{{ ctng_vendor }}-linux-gnu/bin/ld
         - test -f ${PREFIX}/bin/{{ ctng_cpu_arch }}-conda_cos6-linux-gnu-ar  # [x86_64]
         - test -f ${PREFIX}/bin/{{ ctng_cpu_arch }}-conda_cos7-linux-gnu-ar  # [not x86_64]
         - test -f ${PREFIX}/bin/{{ ctng_cpu_arch }}-conda_cos6-linux-gnu-ld  # [x86_64]