Bug 1277124 - Remove outdated definition in GeckoProgram. r?mshal draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 01 Jun 2016 11:07:29 +0900
changeset 373686 9208f7b17956477be02abc7bdad598a0eb41fd65
parent 373685 b8385e584b257f053329134cd494a892981ffe5e
child 522444 b35b9b99417b479d0472510264beebfbdaf12f8a
push id19808
push userbmo:mh+mozilla@glandium.org
push dateWed, 01 Jun 2016 02:12:52 +0000
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.
--- a/build/gecko_templates.mozbuild
+++ b/build/gecko_templates.mozbuild
@@ -66,18 +66,16 @@ def GeckoBinary(linkage='dependent', msv
             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']
                 error('`mozglue` must be "program" or "library"')
     if not CONFIG['JS_STANDALONE']:
         USE_LIBS += [