Skip to content

Commit 99731e7

Browse files
authored
Unified Builds of jsapi and jsglue (#553)
* Unified cc and bindgen Build Unified cc and bindgen Flags Reorganized Buildscript Signed-off-by: Redfire <redfire75369@hotmail.com> * Install LLVM 19 on aarch64 Windows CI Signed-off-by: Redfire <redfire75369@hotmail.com> * Inlined bindgen Configuration Signed-off-by: Redfire <redfire75369@hotmail.com> * mozjs-sys Version Bump Signed-off-by: Redfire <redfire75369@hotmail.com> --------- Signed-off-by: Redfire <redfire75369@hotmail.com>
1 parent 728acdf commit 99731e7

File tree

3 files changed

+787
-820
lines changed

3 files changed

+787
-820
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,16 @@ jobs:
121121
run: |
122122
curl -SL "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-4.0.zip" --create-dirs -o target/dependencies/moztools.zip
123123
cd target/dependencies && unzip -qo moztools.zip -d .
124+
- name: Install LLVM 19 on aarch64
125+
if: contains(matrix.target, 'aarch64')
126+
run: |
127+
# install due to build errors caused by a bug in llvm 18
128+
# https://github.com/llvm/llvm-project/pull/93235
129+
# remove when windows runner updates to llvm 19
130+
iwr -useb get.scoop.sh -outfile 'install.ps1'
131+
.\install.ps1 -RunAsAdmin
132+
scoop install llvm@19.1.7 --global
133+
echo "C:\ProgramData\scoop\scoop\apps\llvm\current\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
124134
- name: Run sccache-cache
125135
uses: mozilla-actions/sccache-action@v0.0.8
126136
- name: Build Windows

mozjs-sys/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
name = "mozjs_sys"
33
description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
44
repository.workspace = true
5-
version = "0.128.9-2"
5+
version = "0.128.9-3"
66
authors = ["Mozilla"]
77
links = "mozjs"
8-
build = "build.rs"
98
license.workspace = true
109
exclude = [
1110
"mozjs/js/src/tests/**",

0 commit comments

Comments
 (0)