From af4d6a692144c76b3749331c6b880306ce1f8a2f Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 9 Feb 2010 12:09:06 -0500
Subject: [PATCH] Bug 543081.  Put -lobjc in LDFLAGS, not LIXBUL_LIBS.  r=ted

---
 configure.in        | 4 ++--
 js/src/configure.in | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index e023e3337e73..53e039e68b24 100644
--- a/configure.in
+++ b/configure.in
@@ -4901,10 +4901,10 @@ cairo-cocoa)
     AC_DEFINE(XP_MACOSX)
     TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
     TK_CFLAGS="-DNO_X11"
-    LDFLAGS="$LDFLAGS -framework Cocoa"
+    LDFLAGS="$LDFLAGS -framework Cocoa -lobjc"
     CFLAGS="$CFLAGS $TK_CFLAGS"
     CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
-    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
     MOZ_FS_LAYOUT=bundle
     MOZ_WEBGL=1
     ;;
diff --git a/js/src/configure.in b/js/src/configure.in
index 629b71870182..f5259f307806 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1508,7 +1508,8 @@ case "$host" in
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
     HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+    LDFLAGS="$LDFLAGS -lobjc"
+    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
     ;;
 
 *-linux*|*-kfreebsd*-gnu)