Skip to content

Commit db76c05

Browse files
committed
Ignore stubdata object
This fixes an issue where functions that require ICU data segfault the process due to an unexpected lack of ICU data. The actual ICU data is provided by the icudt71_dat object.
1 parent d742196 commit db76c05

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

libexec/build-monolith

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ platform=$(uname)
2121
rm -f "${LIBV8_MONOLITH}"
2222
case "${platform}" in
2323
"SunOS")
24-
/usr/xpg4/bin/find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" | sort | uniq | while read -r obj; do
24+
/usr/xpg4/bin/find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -and '(' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" ')' | sort | uniq | while read -r obj; do
2525
ar cqS "${LIBV8_MONOLITH}" "${obj}"
2626
done
2727
ranlib "${LIBV8_MONOLITH}"
2828
;;
2929
"Darwin")
30-
/usr/bin/find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" | sort | uniq | while read -r obj; do
30+
/usr/bin/find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -and '(' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" ')' | sort | uniq | while read -r obj; do
3131
/usr/bin/ar -cqS "${LIBV8_MONOLITH}" "${obj}"
3232
done
3333
/usr/bin/ranlib "${LIBV8_MONOLITH}"
3434
;;
3535
"Linux")
36-
find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" | sort | uniq | xargs ar -cqS "${LIBV8_MONOLITH}"
36+
find . '(' '!' -path './icutools/deps/icu-small/source/stubdata/stubdata.o' ')' -and '(' -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" ')' | sort | uniq | xargs ar -cqS "${LIBV8_MONOLITH}"
3737
ranlib "${LIBV8_MONOLITH}"
3838
;;
3939
*)

0 commit comments

Comments
 (0)