Bug 1277124 - Remove outdated definition in GeckoProgram. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 01 Jun 2016 11:07:29 +0900
changeset 300023 2b74c4db83cc5eadf6cd41679572185c35d61bf4
parent 300022 ba695fcbedc87f48ee05f9bcdb2bcf9e9fb653a1
child 300030 199560989621a1fb7790aa9f44cfb07aea49a755
push id77795
push usermh@glandium.org
push dateWed, 01 Jun 2016 23:49:20 +0000
treeherdermozilla-inbound@2b74c4db83cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1277124
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1277124 - Remove outdated definition in GeckoProgram. r=mshal When building a desktop version of Firefox with MOZ_LINKER enabled, the zlib library is necessary for mozglue. The mozglue library is statically linked to programs on desktop builds of Firefox, and the required setup for those things is done in the GeckoProgram template, along with adding the necessary zlib linkage. Not sure how events went through but the current definitions in mozglue/build/moz.build and config/external/zlib/moz.build make it that USE_LIBS += ['mozglue'] currently implies zlib being linked in that case without it being done explicitly in GeckoProgram, so remove that.
build/gecko_templates.mozbuild
--- a/build/gecko_templates.mozbuild
+++ b/build/gecko_templates.mozbuild
@@ -66,18 +66,16 @@ def GeckoBinary(linkage='dependent', msv
             LDFLAGS += CONFIG['MOZ_GLUE_WRAP_LDFLAGS']
             if mozglue == 'program':
                 USE_LIBS += ['mozglue']
                 if CONFIG['MOZ_GLUE_IN_PROGRAM']:
                     if CONFIG['GNU_CC']:
                         LDFLAGS += ['-rdynamic']
                     if CONFIG['MOZ_MEMORY']:
                         USE_LIBS += ['memory']
-                    if CONFIG['MOZ_LINKER']:
-                        OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
             elif mozglue == 'library':
                 if not CONFIG['MOZ_GLUE_IN_PROGRAM']:
                     USE_LIBS += ['mozglue']
             else:
                 error('`mozglue` must be "program" or "library"')
 
     if not CONFIG['JS_STANDALONE']:
         USE_LIBS += [