Bug 536451 - [OS/2] cannot handle mozsqlite3.dll; fix for c-c to find xpcom_core.lib with m-c.
authorWalter Meinl <wuno@lsvw.de>
Fri, 05 Feb 2010 20:35:10 +0100
changeset 4841 74377b3a4cd5681d777d8e254a957c9ad086fc1e
parent 4840 72fadb79f4e7a76913f232e3f4bd4906ff007f51
child 4842 27334ef4b0be5f5828116fafe74fc96ac9888266
push id3781
push usersgautherie.bz@free.fr
push dateFri, 05 Feb 2010 19:36:44 +0000
treeherdercomm-central@27334ef4b0be [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs536451
Bug 536451 - [OS/2] cannot handle mozsqlite3.dll; fix for c-c to find xpcom_core.lib with m-c. r=standard8.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -2505,17 +2505,21 @@ case "$target" in
     IMPLIB='emximp -o'
     FILTER='emxexp -o'
     LDFLAGS='-Zmap'
     WARNINGS_AS_ERRORS='-Werror'
     MOZ_DEBUG_FLAGS="-g -fno-inline"
     MOZ_OPTIMIZE_FLAGS="-O2"
     MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
     MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcomct.lib'
-    DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcomcor.lib'
+    if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
+        DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcomcor.lib'
+    else
+        DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib'
+    fi
     LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
     TARGET_MD_ARCH=os2
     _PLATFORM_DEFAULT_TOOLKIT="cairo-os2"
     RC=rc.exe
     RCFLAGS='-n'
     MOZ_USER_DIR="Mozilla"
 
     if test "$MOZTOOLS"; then