Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
rushilmehra committed Oct 23, 2024
1 parent bb373e5 commit 1300073
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -320,7 +320,7 @@ 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 [email protected] && brew install ${{ matrix.target }}
Expand All @@ -332,6 +332,12 @@ jobs:
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
- 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

Expand Down
4 changes: 2 additions & 2 deletions boring-sys/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}
},
Expand Down

0 comments on commit 1300073

Please sign in to comment.