Mercurial > hg > release > icedtea7-forest-2.2 > jdk

changeset 5083:2b9fbd5a6ec0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7150516: [macosx] appletviewer shouldn't link against libX11 on the Mac Summary: Don't link against libX11 on the Mac Reviewed-by: swingler
author anthony
date Mon, 05 Mar 2012 18:58:51 +0400
parents 4ab378286f66
children 9bc378ddbc27
files make/launchers/Makefile.launcher
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/launchers/Makefile.launcher	Mon Mar 05 15:27:15 2012 +0200
+++ b/make/launchers/Makefile.launcher	Mon Mar 05 18:58:51 2012 +0400
@@ -159,8 +159,10 @@
 # GUI tools
 ifeq ($(GUI_TOOL),true)
   ifneq ($(PLATFORM), windows)
-    # Anything with a GUI needs X11 to be linked in.
-    OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
+    ifneq ($(PLATFORM), macosx)
+      # Anything with a GUI needs X11 to be linked in.
+      OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
+    endif
   endif
 endif