Skip to content

Commit f8967dc

Browse files
cataphractlloeki
authored andcommitted
Fix Solaris build
1 parent 9eb9a58 commit f8967dc

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

build-monolith

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ rm -f "${LIBV8_MONOLITH}"
1919
case "${platform}" in
2020
"SunOS")
2121
/usr/xpg4/bin/find . -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" | sort | uniq | while read -r obj; do
22-
xargs ar cqS "${LIBV8_MONOLITH}" "${obj}"
22+
ar cqS "${LIBV8_MONOLITH}" "${obj}"
2323
done
2424
ranlib "${LIBV8_MONOLITH}"
2525
;;

inject-libv8

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ cd "src/node-${version}"
1111
BASEDIR="${PWD}"
1212
BUILDTYPE="${BUILDTYPE:-Release}"
1313

14+
platform=$(uname)
15+
16+
case "${platform}" in
17+
SunOS)
18+
STRIP="${STRIP:-gstrip}"
19+
;;
20+
*)
21+
STRIP="${STRIP:-strip}"
22+
;;
23+
esac
24+
1425
cd "${BASEDIR}/deps/v8/include"
1526

1627
rm -rf "${top}/vendor/v8/include"
@@ -26,6 +37,7 @@ rm -rf "${top}/vendor/v8/out.gn"
2637
for lib in libv8_monolith.a; do
2738
dir="${top}/vendor/v8/out.gn/libv8/obj/$(dirname "${lib}")"
2839
mkdir -p "${dir}"
29-
rm -fv "${dir}/${lib}"
30-
strip -S -x -o "${dir}/${lib}" "${lib}"
40+
rm -f "${dir}/${lib}"
41+
42+
"${STRIP}" -S -x -o "${dir}/${lib}" "${lib}"
3143
done

0 commit comments

Comments
 (0)