This commit is contained in:
parent
6db3c5a12f
commit
be9029c515
@ -1,7 +1,8 @@
|
|||||||
diff -ruN v8-0.106.0.orig/build/config/clang/BUILD.gn v8-0.106.0/build/config/clang/BUILD.gn
|
diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
|
||||||
--- a/rusty_v8/build/config/clang/BUILD.gn 2024-11-10 19:22:12.986627534 +0800
|
index fcca59b0f..fdf14f306 100644
|
||||||
+++ b/rusty_v8/build/config/clang/BUILD.gn 2024-11-10 19:52:00.676576200 +0800
|
--- a/rusty_v8/build/config/clang/BUILD.gn
|
||||||
@@ -192,12 +192,15 @@
|
+++ b/rusty_v8/build/config/clang/BUILD.gn
|
||||||
|
@@ -192,12 +192,15 @@ template("clang_lib") {
|
||||||
} else if (is_linux || is_chromeos) {
|
} else if (is_linux || is_chromeos) {
|
||||||
if (current_cpu == "x64") {
|
if (current_cpu == "x64") {
|
||||||
_dir = "x86_64-unknown-linux-gnu"
|
_dir = "x86_64-unknown-linux-gnu"
|
||||||
@ -17,17 +18,16 @@ diff -ruN v8-0.106.0.orig/build/config/clang/BUILD.gn v8-0.106.0/build/config/cl
|
|||||||
} else {
|
} else {
|
||||||
assert(false) # Unhandled cpu type
|
assert(false) # Unhandled cpu type
|
||||||
}
|
}
|
||||||
@@ -228,7 +231,12 @@
|
@@ -228,6 +231,11 @@ template("clang_lib") {
|
||||||
assert(false) # Unhandled target platform
|
assert(false) # Unhandled target platform
|
||||||
}
|
}
|
||||||
|
|
||||||
- _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
|
|
||||||
+ # Bit of a hack to make this find builtins from compiler-rt >= 16
|
+ # Bit of a hack to make this find builtins from compiler-rt >= 16
|
||||||
+ if (is_linux || is_chromeos) {
|
+ if (is_linux || is_chromeos) {
|
||||||
+ _dir = "linux"
|
+ _dir = "linux"
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ _clang_lib_dir = "$clang_base_path/lib64/clang/$clang_version/lib"
|
_clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
|
||||||
_lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
|
_lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
|
||||||
libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
|
libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
|
||||||
}
|
|
||||||
|
@ -44,7 +44,6 @@ BuildRequires: llvm-gold
|
|||||||
BuildRequires: ninja
|
BuildRequires: ninja
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: python3-base
|
BuildRequires: python3-base
|
||||||
BuildRequires: sccache
|
|
||||||
BuildRequires: zstd
|
BuildRequires: zstd
|
||||||
BuildRequires: pkgconfig(glib-2.0)
|
BuildRequires: pkgconfig(glib-2.0)
|
||||||
BuildRequires: pkgconfig(gmodule-2.0)
|
BuildRequires: pkgconfig(gmodule-2.0)
|
||||||
@ -105,6 +104,14 @@ updated with the --reload flag.
|
|||||||
tar xvf %{SOURCE1}
|
tar xvf %{SOURCE1}
|
||||||
# Now we patch V8 or %%{SOURCE2}
|
# Now we patch V8 or %%{SOURCE2}
|
||||||
echo -e "\n[patch.crates-io]\nv8 = { path = './rusty_v8' }" >> Cargo.toml
|
echo -e "\n[patch.crates-io]\nv8 = { path = './rusty_v8' }" >> Cargo.toml
|
||||||
|
pushd rusty_v8
|
||||||
|
# Keeping this ifarch in case someone tries to build 32 bit
|
||||||
|
# which is not our problem
|
||||||
|
%ifarch x86_64 || x86_64_v3 || aarch64
|
||||||
|
# lib to lib64
|
||||||
|
sed -i 's|lib/clang|lib64/clang|g' build/config/clang/BUILD.gn
|
||||||
|
%endif
|
||||||
|
popd
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CARGO_HOME="$PWD/.cargo"
|
export CARGO_HOME="$PWD/.cargo"
|
||||||
|
Loading…
Reference in New Issue
Block a user