chromium: force use of ld(1) --no-keep-memory.

This commit is contained in:
Juan RP 2014-09-26 11:56:02 +02:00
parent d64843d835
commit 28a53e5cc6
2 changed files with 13 additions and 10 deletions

View file

@ -0,0 +1,13 @@
Building with -g on x86 can use more than 4G memory, so try to
lower the memory requirement by forcing ld(1) --no-keep-memory.
--- build/common.gypi.orig 2014-09-26 11:50:55.381056525 +0200
+++ build/common.gypi 2014-09-26 11:51:58.281560018 +0200
@@ -3287,6 +3287,7 @@
'ldflags': [
'-Wl,-z,now',
'-Wl,-z,relro',
+ '-Wl,--no-keep-memory',
],
},
}],

View file

@ -51,11 +51,6 @@ pre_configure() {
do_configure() { do_configure() {
local conf="" local conf=""
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# Use linker flags to reduce memory consumption
LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
fi
unset CC CXX unset CC CXX
export -n CFLAGS CXXFLAGS LDFLAGS export -n CFLAGS CXXFLAGS LDFLAGS
@ -147,7 +142,6 @@ do_configure() {
esac esac
conf+=" -Dtarget_arch=${arch}" conf+=" -Dtarget_arch=${arch}"
fi fi
# https://code.google.com/p/chromium/issues/detail?id=386097 # https://code.google.com/p/chromium/issues/detail?id=386097
third_party/libaddressinput/chromium/tools/update-strings.py third_party/libaddressinput/chromium/tools/update-strings.py
@ -157,10 +151,6 @@ do_configure() {
do_build() { do_build() {
unset CC CXX unset CC CXX
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# Use linker flags to reduce memory consumption
LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
fi
export -n CFLAGS CXXFLAGS LDFLAGS export -n CFLAGS CXXFLAGS LDFLAGS
ninja -C out/Release ${makejobs} chrome chrome_sandbox chromedriver ninja -C out/Release ${makejobs} chrome chrome_sandbox chromedriver
} }