debugging ci

Author: moztcampbell

libs/build-nss-desktop.sh

@@ -78,6 +78,12 @@ elif [[ "$(uname -s)" == "Darwin" ]] || [[ "$(uname -s)" == "Linux" ]]; then
     -Dsign_libs=0 \
     -Ddisable_libpkix=1
   NSS_DIST_DIR="${NSS_SRC_DIR}/dist"
+
+  # Debug output for CI
+  if [[ -f "${NSS_SRC_DIR}/nss/out/Release/build.ninja" ]]; then
+    echo "=== Dumping build.ninja for nss-desktop ==="
+    cat "${NSS_SRC_DIR}/nss/out/Release/build.ninja"
+  fi
 fi
 
 # Assemble the DIST_DIR with relevant libraries and headers

libs/build-nss-ios.sh

@@ -93,6 +93,8 @@ gyp -f ninja "${NSS_SRC_DIR}/nss/nss.gyp" \
   -Dpython=python3
 
 GENERATED_DIR="${NSS_SRC_DIR}/nss/out/Release-$(echo ${OS_COMPILER} | tr '[:upper:]' '[:lower:]')/"
+echo "=== Dumping build.ninja for nss-ios ==="
+cat "${GENERATED_DIR}/build.ninja"
 ninja -C "${GENERATED_DIR}"
 
 # Assemble the DIST_DIR with relevant libraries and headers

libs/build-nss-macos-cross.sh

@@ -47,38 +47,68 @@ if [[ -z "${!nss_dir_var}" ]]; then
 fi
 
 # Use toolchain configuration from environment
-eval "CC=\$${RUST_ANDROID_PREFIX}_CC"
+eval "BASE_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 "TOOLCHAIN_BIN=\$${RUST_ANDROID_PREFIX}_TOOLCHAIN_PREFIX"
 eval "CFLAGS=\$${RUST_ANDROID_PREFIX}_CFLAGS_${NSS_TARGET//-/_}"
-eval "LDFLAGS=\$${RUST_ANDROID_PREFIX}_LDFLAGS_${NSS_TARGET//-/_}"
+
+# Bake all compiler/linker flags into CC like build-nss-ios.sh does
+# This ensures ninja picks up the flags for both compilation and linking
+CC="${BASE_CC} ${CFLAGS}"
+export CC
 
 # 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="${AS}" \
+  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
 
 # Build NSS using gyp
 NSS_BUILD_DIR=$(mktemp -d)
 rm -rf "${NSS_SRC_DIR}/nss/out"
 
-gyp -f ninja "${NSS_SRC_DIR}/nss/nss.gyp" \
+# Create a fake xcodebuild script and tool wrappers to allow gyp to use the mac flavor
+# This tricks gyp into thinking Xcode is installed so it generates macOS-style build rules
+FAKE_XCODE_DIR=$(mktemp -d)
+cat > "${FAKE_XCODE_DIR}/xcodebuild" << 'EOF'
+#!/bin/bash
+# Fake xcodebuild that returns a version for gyp's mac flavor
+# Xcode 12.2 corresponds to macOS SDK 11.0 (Big Sur) and adds Apple Silicon support
+echo "Xcode 12.2"
+echo "Build version 12B45b"
+EOF
+chmod +x "${FAKE_XCODE_DIR}/xcodebuild"
+
+# Create unprefixed symlinks to cctools binaries that gyp's mac flavor expects
+# The mac flavor expects tools like 'otool', 'libtool', 'lipo' without the target prefix
+ln -s "${TOOLCHAIN_BIN}/${NSS_TARGET}-otool" "${FAKE_XCODE_DIR}/otool"
+ln -s "${TOOLCHAIN_BIN}/${NSS_TARGET}-libtool" "${FAKE_XCODE_DIR}/libtool"
+ln -s "${TOOLCHAIN_BIN}/${NSS_TARGET}-lipo" "${FAKE_XCODE_DIR}/lipo"
+ln -s "${TOOLCHAIN_BIN}/${NSS_TARGET}-nm" "${FAKE_XCODE_DIR}/nm"
+
+export PATH="${FAKE_XCODE_DIR}:${PATH}"
+
+gyp -f ninja-mac "${NSS_SRC_DIR}/nss/nss.gyp" \
   --depth "${NSS_SRC_DIR}/nss/" \
   --generator-output=. \
   -DOS=mac \
@@ -97,6 +127,11 @@ gyp -f ninja "${NSS_SRC_DIR}/nss/nss.gyp" \
   -Dpython=python3
 
 GENERATED_DIR="${NSS_SRC_DIR}/nss/out/Release/"
+echo "=== Dumping build.ninja for nss-macos-cross ==="
+cat "${GENERATED_DIR}/build.ninja"
+
+# With the mac flavor, we can build all targets including shared libraries
+# The generated ninja rules will use macOS-style linker flags (e.g., -install_name instead of -soname)
 ninja -C "${GENERATED_DIR}"
 
 # Assemble the DIST_DIR with relevant libraries and headers
@@ -112,3 +147,4 @@ ninja -C "${GENERATED_DIR}"
 # Cleanup
 rm -rf "${NSS_BUILD_DIR}"
 rm -rf "${NSPR_BUILD_DIR}"
+rm -rf "${FAKE_XCODE_DIR}"

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

@@ -29,11 +29,12 @@ 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}_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