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.
8171471: libawt_xawt and libawt_headless should not set rpath to /..
authorerikj
Tue, 27 Dec 2016 09:44:54 +0100
changeset 42949 e6f64da65620
parent 42948 1f4754f075f2
child 42950 526b862a4bc4
8171471: libawt_xawt and libawt_headless should not set rpath to /.. Reviewed-by: tbell, redestad
jdk/make/lib/Awt2dLibraries.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/lib/Awt2dLibraries.gmk	Mon Dec 26 19:38:27 2016 +0100
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Tue Dec 27 09:44:54 2016 +0100
@@ -362,7 +362,6 @@
         MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN) \
-            $(call SET_SHARED_LIBRARY_ORIGIN,/..) \
             -L$(INSTALL_LIBRARIES_HERE), \
         LIBS :=  $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
         VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
@@ -564,8 +563,6 @@
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
-      LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
-      LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
       REORDER := $(LIBAWT_HEADLESS_REORDER), \
       LIBS_unix := -lawt -ljvm -ljava, \
       LIBS_linux := $(LIBM) $(LIBDL), \
jdk-sandbox