From 93691542dd03afec5661c25bab03d05783aeb7f5 Mon Sep 17 00:00:00 2001
From: Rushil Mehra <rmehra@cloudflare.com>
Date: Tue, 22 Oct 2024 16:27:26 -0700
Subject: [PATCH] wip

---
 .github/workflows/ci.yml | 18 +++++++++++++++---
 boring-sys/build/main.rs |  4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 083ee77c..f5950567 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -293,7 +293,7 @@ jobs:
     - name: Set CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER
       run: echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=${{ matrix.target }}-gcc" >> $GITHUB_ENV
     - name: Build for ${{ matrix.target }}
-      run: cargo build --target ${{ matrix.target }} --all-targets
+      run: cargo build -vvv --target ${{ matrix.target }} --all-targets
 
   cross-build-fips:
     name: Cross build from macOS to Linux (FIPS)
@@ -320,10 +320,16 @@ jobs:
         directory: ${{ runner.temp }}/llvm
     - name: Add clang++-12 link
       working-directory: ${{ runner.temp }}/llvm/bin
-      run: ln -s clang clang++-12
+      run: ln -s clang++ clang++-12
     - name: Install ${{ matrix.target }} toolchain
       # TODO(rmehra): find a better way to overwrite the python3 version without specifying version
       run: brew tap messense/macos-cross-toolchains && brew install --overwrite python@3.12 && brew install ${{ matrix.target }}
+    - name: Debug brew
+      run: brew linkage x86_64-unknown-linux-gnu
+    - name: Debug brew2
+      run: brew linkage --test x86_64-unknown-linux-gnu
+    - name: Debug brew3
+      run: brew doctor
     - name: Set BORING_BSSL_FIPS_COMPILER_EXTERNAL_TOOLCHAIN
       run: echo "BORING_BSSL_FIPS_COMPILER_EXTERNAL_TOOLCHAIN=$(brew --prefix ${{ matrix.target }})/toolchain" >> $GITHUB_ENV
       shell: bash
@@ -331,7 +337,13 @@ jobs:
       run: echo "BORING_BSSL_FIPS_SYSROOT=$BORING_BSSL_FIPS_COMPILER_EXTERNAL_TOOLCHAIN/${{ matrix.target }}/sysroot" >> $GITHUB_ENV
       shell: bash
     - name: Set CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER
-      run: echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=${{ matrix.target }}-gcc" >> $GITHUB_ENV
+      run: echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc" >> $GITHUB_ENV
+    - name: Debug
+      run: which clang
+      shell: bash
+    - name: Debug
+      run: ls /Users/runner/work/_temp/llvm/bin
+      shell: bash
     - name: Build for ${{ matrix.target }}
       run: cargo build --target ${{ matrix.target }} --all-targets --features fips
 
diff --git a/boring-sys/build/main.rs b/boring-sys/build/main.rs
index 7966e215..76d3f9d1 100644
--- a/boring-sys/build/main.rs
+++ b/boring-sys/build/main.rs
@@ -318,8 +318,8 @@ fn get_boringssl_cmake_config(config: &Config) -> cmake::Config {
             }
             _ => {
                 eprintln!(
-                    "warning: no toolchain file configured by boring-sys for {}",
-                    config.target
+                    "warning: no toolchain file configured by boring-sys for {} and {}",
+                    config.target, config.target_arch
                 );
             }
         },