forked from
me.webbeef.org/browser.html
Rewild Your Web
build: fix arm64 builds
Signed-off-by: webbeef <me@webbeef.org>
+32
-15
+1
-1
build-arm64.sh
+1
-1
build-arm64.sh
···
30
30
# Build without tray icon or global key support
31
31
cargo build --target aarch64-unknown-linux-gnu --profile ${PROFILE} -p beaver-shell \
32
32
--no-default-features \
33
-
--features="libservo/clipboard,js_jit,max_log_level,webgpu"
33
+
--features="servo/clipboard,js_jit,max_log_level,webgpu"
34
34
35
35
llvm-strip target/aarch64-unknown-linux-gnu/${PROFILE}/beavershell
36
36
+1
-1
crates/beaver_p2p/Cargo.toml
+1
-1
crates/beaver_p2p/Cargo.toml
···
5
5
6
6
[dependencies]
7
7
env_logger = "0.11"
8
-
iroh = { version = "0.96", features = ["address-lookup-mdns"] }
8
+
iroh = { version = "0.96", default-features = false, features = ["address-lookup-mdns"] }
9
9
iroh-persist = { git = "https://github.com/webbeef/iroh-persist.git", branch = "iroh-0.96" }
10
10
log = "0.4"
11
11
n0-error = "0.1"
+30
-13
support/arm64/fake-clang-ld.sh
+30
-13
support/arm64/fake-clang-ld.sh
···
4
4
# License, v. 2.0. If a copy of the MPL was not distributed with this
5
5
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
6
7
-
SYSROOT=`pwd`/scripts/servo-arm64-sysroot
7
+
SYSROOT="$(pwd)/scripts/servo-arm64-sysroot"
8
8
9
-
PARAMS=""
9
+
PARAMS=()
10
10
11
-
FORBIDDEN=("--strip-debug", "--strip-all", "--as-needed", "--eh-frame-hdr", "--gc-sections", "-znoexecstack", "-zrelro", "-znow")
11
+
FORBIDDEN=(
12
+
"--no-undefined-version"
13
+
"--strip-debug"
14
+
"--strip-all"
15
+
"--as-needed"
16
+
"--eh-frame-hdr"
17
+
"--gc-sections"
18
+
"-znoexecstack"
19
+
"-zrelro"
20
+
"-znow"
21
+
)
12
22
13
-
for param in $*; do
23
+
for param in "$@"; do
24
+
# Filter version-script arguments
25
+
if [[ "$param" == --version-script=* || "$param" == -Wl,--version-script=* ]]; then
26
+
echo "Filtered version script: $param"
27
+
continue
28
+
fi
14
29
15
-
case "${FORBIDDEN[@]}" in
16
-
*"$param"*)
17
-
echo "Variable is in the forbidden set: $param"
18
-
;;
19
-
*)
20
-
PARAMS+="$param "
21
-
;;
22
-
esac
30
+
# Filter forbidden exact matches
31
+
if [[ " ${FORBIDDEN[*]} " == *" $param "* ]]; then
32
+
echo "Variable is in the forbidden set: $param"
33
+
continue
34
+
fi
23
35
36
+
PARAMS+=("$param")
24
37
done
25
38
26
-
clang --target=aarch64-linux-gnu --sysroot=${SYSROOT} -fuse-ld=lld $PARAMS
39
+
exec clang \
40
+
--target=aarch64-linux-gnu \
41
+
--sysroot="$SYSROOT" \
42
+
-fuse-ld=lld \
43
+
"${PARAMS[@]}"