Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Also respect readelf and objcopy cc-rs variants #465

Merged
merged 2 commits into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
brew install llvm yasm
- name: Run sccache-cache
uses: mozilla-actions/[email protected].3
uses: mozilla-actions/[email protected].4
- name: Build
run: |
cargo build --verbose --features ${{ matrix.features }}
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
run: |
sudo apt install llvm -y
- name: Run sccache-cache
uses: mozilla-actions/[email protected].3
uses: mozilla-actions/[email protected].4
- name: Build
run: |
cargo build --verbose --features ${{ matrix.features }}
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
curl -SL "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-4.0.zip" --create-dirs -o target/dependencies/moztools.zip
cd target/dependencies && unzip -qo moztools.zip -d .
- name: Run sccache-cache
uses: mozilla-actions/[email protected].3
uses: mozilla-actions/[email protected].4
- name: Build Windows
shell: cmd
run: |
Expand Down
2 changes: 2 additions & 0 deletions mozjs-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ const SM_TARGET_ENV_VARS: &'static [&'static str] = &[
"CPPFLAGS",
"CXX",
"CXXFLAGS",
"READELF",
"OBJCOPY",
];

const EXTRA_FILES: &'static [&'static str] = &[
Expand Down