aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD4
-rwxr-xr-xbinary_tarball/scripts/3_Configure_Source_Code.sh6
2 files changed, 5 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 2d2354c..e8825e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -224,7 +224,6 @@ ac_add_options --enable-profile-use
ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
ac_add_options --enable-linker=lld
-ac_add_options --disable-elf-hack
END
else
@@ -234,7 +233,8 @@ ac_add_options --enable-lto=cross
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
-ac_add_options --enable-linker=gold
+ac_add_options --enable-linker=lld
+ac_add_options --disable-elf-hack
END
fi
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh
index 99e3d6a..eb6807f 100755
--- a/binary_tarball/scripts/3_Configure_Source_Code.sh
+++ b/binary_tarball/scripts/3_Configure_Source_Code.sh
@@ -112,10 +112,10 @@ END
fi
# hopefully the magic sauce that makes things build on 16.04 and later on work "everywhere":
-patch -p1 -i "${CI_PROJECT_DIR}/armhf-reduce-linker-memory-use.patch"
+patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/armhf-reduce-linker-memory-use.patch"
patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch"
-patch -p1 -i "${CI_PROJECT_DIR}/fix-armhf-webrtc-build.patch"
-patch -p1 -i "${CI_PROJECT_DIR}/webrtc-fix-compiler-flags-for-armhf.patch"
+patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/fix-armhf-webrtc-build.patch"
+patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch"
# https://bugzilla.mozilla.org/show_bug.cgi?id=1654465
patch -p1 -i ${CI_PROJECT_DIR}/bug1654465.diff
bgstack15