From 8b80e36d010c5598042aae4637f4b6ac41c747cd Mon Sep 17 00:00:00 2001 From: marxin Date: Fri, 26 Jan 2018 00:57:00 +0200 Subject: [PATCH] Bug 1433383 Properly detect -flto flag. r=froydnj --- toolkit/library/StaticXULComponentsEnd/moz.build | 6 ++++-- toolkit/library/moz.build | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/toolkit/library/StaticXULComponentsEnd/moz.build b/toolkit/library/StaticXULComponentsEnd/moz.build index 67989edd4901..2e769cbff9db 100644 --- a/toolkit/library/StaticXULComponentsEnd/moz.build +++ b/toolkit/library/StaticXULComponentsEnd/moz.build @@ -7,8 +7,10 @@ SOURCES += [ ] # Don't let LTO reorder StaticXULComponentsStart.o. -if '-flto' in CONFIG['OS_CXXFLAGS']: - SOURCES['StaticXULComponentsEnd.cpp'].flags += ['-fno-lto'] +for f in CONFIG['OS_CXXFLAGS']: + if f.startswith('-flto'): + SOURCES['StaticXULComponentsEnd.cpp'].flags += ['-fno-lto'] + break Library('StaticXULComponentsEnd') diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index 8d51a0bf9126..b0df6b98b91f 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -92,8 +92,10 @@ SOURCES += [ SOURCES['StaticXULComponentsStart.cpp'].no_pgo = True # Don't let LTO reorder StaticXULComponentsStart.o. -if '-flto' in CONFIG['OS_CXXFLAGS']: - SOURCES['StaticXULComponentsStart.cpp'].flags += ['-fno-lto'] +for f in CONFIG['OS_CXXFLAGS']: + if f.startswith('-flto'): + SOURCES['StaticXULComponentsStart.cpp'].flags += ['-fno-lto'] + break if CONFIG['OS_ARCH'] == 'WINNT': SOURCES += [