From 0501ed4bbdbf8d16a69a4460d2ada33ac259365d Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Wed, 15 Apr 2020 00:27:25 +0200 Subject: [PATCH 20/30] bmo#1516803: force one LTO partition for sandbox when using GCC Signed-off-by: Thomas Deutschmann --- security/sandbox/linux/moz.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build index e62d1a99a4..913b9ba2ce 100644 --- a/security/sandbox/linux/moz.build +++ b/security/sandbox/linux/moz.build @@ -114,9 +114,10 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"): # gcc lto likes to put the top level asm in syscall.cc in a different partition # from the function using it which breaks the build. Work around that by # forcing there to be only one partition. -for f in CONFIG["OS_CXXFLAGS"]: - if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang": - LDFLAGS += ["--param", "lto-partitions=1"] +if CONFIG["CC_TYPE"] != "clang" and CONFIG["MOZ_LTO_LDFLAGS"] is not None: + for f in CONFIG["MOZ_LTO_LDFLAGS"]: + if f.startswith("-flto"): + LDFLAGS += ["--param", "lto-partitions=1"] DEFINES["NS_NO_XPCOM"] = True DisableStlWrapping() -- 2.34.1