1049935 - Port |Bug 1045783 - move OS_LIBS += $(call EXPAND_LIBNAME,...) calls to moz.build| to comm-central

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Ian Neal]

Attachment: Port OS_LIBS moving to moz.build

Now that the fix to Bug 1045783 has landed on m-c, should probably port it to c-c.
This patch also fixes the incorrect indentation for xpcomglue in mail/app/moz.build

Comment 1

[Joshua Cranmer [:jcranmer]]

Comment on attachment 8468848 [details] [diff] [review]
Port OS_LIBS moving to moz.build

Review of attachment 8468848 [details] [diff] [review]:
-----------------------------------------------------------------

You've negated the case of two of the zlib additions, which concerns me--I want to double check that the correct result builds on Windows before giving r+. Of course, Windows is broken for other reasons (relating to DEFFILE I think).

::: mailnews/build/moz.build
@@ +28,5 @@
>      'js',
>  ]
>  
> +if CONFIG['OS_ARCH'] == 'WINNT':
> +    OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']

This case happens if CONFIG['OS_ARCH'] != 'WINNT'

::: mailnews/import/build/moz.build
@@ +56,5 @@
>      if CONFIG['MOZ_MAPI_SUPPORT']:
>          LOCAL_INCLUDES += [
>              '../outlook/src',
>          ]
> +    OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']

Again, this is CONFIG['OS_ARCH'] != 'WINNT'

Comment 2

[Ian Neal]

Attachment: Revised port of OS_LIBS move

Interesting that it still built and ran okay on linux even without those libs.

Comment 3

[Ian Neal]

Attachment: Rebased and revised port of OS_LIBS move

Rebased on top of patch from Bug 1051619

Comment 4

[Ian Neal]

Attachment: Port of OS_LIBS move and framework move [Checked in: Comment 5]

I missed the -framework changes that were part of bug 1045783

Comment 5

[Ian Neal]

Comment on attachment 8471122 [details] [diff] [review]
Port of OS_LIBS move and framework move [Checked in: Comment 5]

http://hg.mozilla.org/comm-central/rev/7a18986c0671