debugging ci

Author: moztcampbell

libs/build-nss-macos-cross.sh

@@ -49,28 +49,34 @@ fi
 # Use toolchain configuration from environment
 eval "CC=\$${RUST_ANDROID_PREFIX}_CC"
 eval "AR=\$${RUST_ANDROID_PREFIX}_AR"
+eval "AS=\$${RUST_ANDROID_PREFIX}_AS"
 eval "RANLIB=\$${RUST_ANDROID_PREFIX}_RANLIB"
+eval "LD=\$${RUST_ANDROID_PREFIX}_LD"
 eval "STRIP=\$${RUST_ANDROID_PREFIX}_TOOLCHAIN_PREFIX/${NSS_TARGET}-strip"
 eval "CFLAGS=\$${RUST_ANDROID_PREFIX}_CFLAGS_${NSS_TARGET//-/_}"
 eval "LDFLAGS=\$${RUST_ANDROID_PREFIX}_LDFLAGS_${NSS_TARGET//-/_}"
 
 # Build NSPR
 NSPR_BUILD_DIR=$(mktemp -d)
 pushd "${NSPR_BUILD_DIR}"
-"${NSS_SRC_DIR}"/nspr/configure \
+if ! "${NSS_SRC_DIR}"/nspr/configure \
   STRIP="${STRIP}" \
   RANLIB="${RANLIB}" \
   AR="${AR}" \
-  AS="${AS:-${AR}}" \
-  LD="${LD:-${AR}}" \
+  AS="${AR}" \
+  LD="${LD}" \
   CC="${CC}" \
   CCC="${CC}" \
   CFLAGS="${CFLAGS}" \
   LDFLAGS="${LDFLAGS}" \
   --target="${NSS_TARGET}" \
   --enable-64bit \
   --disable-debug \
-  --enable-optimize
+  --enable-optimize; then
+  echo "=== NSPR configure failed, dumping config.log ==="
+  cat config.log
+  exit 1
+fi
 make
 popd
 

taskcluster/scripts/toolchain/cross-compile-setup.sh

@@ -29,11 +29,13 @@ for TARGET in x86_64-apple-darwin aarch64-apple-darwin; do
   export ${RUST_ANDROID_PREFIX}_CC=${CLANG_BIN}/clang-20
   export ${RUST_ANDROID_PREFIX}_TOOLCHAIN_PREFIX=${CCTOOL_BIN}
   export ${RUST_ANDROID_PREFIX}_AR=${CCTOOL_BIN}/${TARGET}-ar
+  export ${RUST_ANDROID_PREFIX}_AS=${CCTOOL_BIN}/${TARGET}-as
   export ${RUST_ANDROID_PREFIX}_RANLIB=${CCTOOL_BIN}/${TARGET}-ranlib
+  export ${RUST_ANDROID_PREFIX}_LD=${CCTOOL_BIN}/${TARGET}-ld
   export ${RUST_ANDROID_PREFIX}_LD_LIBRARY_PATH=${CLANG_LIB}
   export ${RUST_ANDROID_PREFIX}_RUSTFLAGS="-C linker=${CLANG_BIN}/clang-20 -C link-arg=-fuse-ld=${CCTOOL_BIN}/${TARGET}-ld -C link-arg=-B -C link-arg=${CCTOOL_BIN} -C link-arg=-target -C link-arg=${TARGET} -C link-arg=-isysroot -C link-arg=${SYSROOT} -C link-arg=-Wl,-syslibroot,${SYSROOT} -C link-arg=-Wl,-dead_strip"
-  export ${RUST_ANDROID_PREFIX}_CFLAGS_${TARGET//-/_}="-B ${CCTOOL_BIN} -target ${TARGET} -isysroot ${SYSROOT}"
-  export ${RUST_ANDROID_PREFIX}_LDFLAGS_${TARGET//-/_}="-B ${CCTOOL_BIN} -target ${TARGET} -isysroot ${SYSROOT} -Wl,-syslibroot,${SYSROOT} -Wl,-dead_strip"
+  export ${RUST_ANDROID_PREFIX}_CFLAGS_${TARGET//-/_}="-B ${CCTOOL_BIN} -target ${TARGET} -isysroot ${SYSROOT} -fuse-ld=${CCTOOL_BIN}/${TARGET}-ld"
+  export ${RUST_ANDROID_PREFIX}_LDFLAGS_${TARGET//-/_}="-B ${CCTOOL_BIN} -target ${TARGET} -isysroot ${SYSROOT} -fuse-ld=${CCTOOL_BIN}/${TARGET}-ld -Wl,-syslibroot,${SYSROOT} -Wl,-dead_strip"
   export ${RUST_ANDROID_PREFIX}_BINDGEN_EXTRA_CLANG_ARGS="--sysroot ${SYSROOT}"
 done
 

taskcluster/scripts/toolchain/desktop-macos.sh

@@ -5,8 +5,8 @@ git submodule update --init
 ./taskcluster/scripts/toolchain/setup-fetched-rust-toolchain.sh
 . ./taskcluster/scripts/toolchain/cross-compile-setup.sh
 pushd libs
-./build-all.sh darwin-x86-64
 ./build-all.sh darwin-aarch64
+./build-all.sh darwin-x86-64
 popd
 mkdir -p "$UPLOAD_DIR"
 tar -czf "$UPLOAD_DIR"/macos.tar.gz libs/desktop