forked from pool/rusty_v8
Merge pull request 'patch: update compiler-rt-adjust-paths.patch' (#2) from mine into factory
Reviewed-on: uncomfyhalomacro/rusty_v8#2
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
|
||||
index fcca59b0f..fdf14f306 100644
|
||||
--- a/build/config/clang/BUILD.gn
|
||||
+++ b/build/config/clang/BUILD.gn
|
||||
@@ -192,12 +192,15 @@ template("clang_lib") {
|
||||
diff -ruN /tmp/rusty_v8-v137.1.0/build/config/clang/BUILD.gn rusty_v8-v137.1.0/build/config/clang/BUILD.gn
|
||||
--- /tmp/rusty_v8-v137.1.0/build/config/clang/BUILD.gn 1970-01-01 08:00:01.000000000 +0800
|
||||
+++ rusty_v8-v137.1.0/build/config/clang/BUILD.gn 2025-06-26 14:47:20.638581652 +0800
|
||||
@@ -201,12 +201,15 @@
|
||||
} else if (is_linux || is_chromeos) {
|
||||
if (current_cpu == "x64") {
|
||||
_dir = "x86_64-unknown-linux-gnu"
|
||||
@@ -14,19 +13,18 @@ index fcca59b0f..fdf14f306 100644
|
||||
_dir = "armv7-unknown-linux-gnueabihf"
|
||||
} else if (current_cpu == "arm64") {
|
||||
_dir = "aarch64-unknown-linux-gnu"
|
||||
+ _suffix = "-aarch64"
|
||||
+ _suffix = "-aarch64'
|
||||
} else {
|
||||
assert(false) # Unhandled cpu type
|
||||
}
|
||||
@@ -228,6 +231,11 @@ template("clang_lib") {
|
||||
@@ -237,6 +240,10 @@
|
||||
assert(false) # Unhandled target platform
|
||||
}
|
||||
|
||||
+ # Bit of a hack to make this find builtins from compiler-rt >= 16
|
||||
+ if (is_linux || is_chromeos) {
|
||||
+ _dir = "linux"
|
||||
+ }
|
||||
+
|
||||
_clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
|
||||
_lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
|
||||
libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
|
||||
|
||||
|
Reference in New Issue
Block a user