Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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
authoranthony
Tue, 27 Mar 2012 15:41:55 +0400
changeset 12280 7e17a63793ca
parent 12279 a88bb2d86435
child 12281 40f247734390
7150516: [macosx] appletviewer shouldn't link against libX11 on the Mac Summary: Don't link against libX11 on the Mac Reviewed-by: art
jdk/make/launchers/Makefile.launcher file | annotate | diff | comparison | revisions 
--- a/jdk/make/launchers/Makefile.launcher	Fri Mar 23 15:16:17 2012 +0200
+++ b/jdk/make/launchers/Makefile.launcher	Tue Mar 27 15:41:55 2012 +0400
@@ -155,8 +155,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
jdk-sandbox