# HG changeset patch
# User erikj
# Date 1476181554 -7200
# Node ID e5ebda6a1a832f6a21d2dab2fe3d2dc358f591d4
# Parent  eaa1c85db7d8f1c8d0eb09d74aa2f308b0ba601e
8167387: libjimage.so has a bad runpath
Reviewed-by: tbell, ihse

diff -r eaa1c85db7d8 -r e5ebda6a1a83 jdk/make/lib/CoreLibraries.gmk
--- a/jdk/make/lib/CoreLibraries.gmk	Tue Oct 11 15:12:40 2016 +0530
+++ b/jdk/make/lib/CoreLibraries.gmk	Tue Oct 11 12:25:54 2016 +0200
@@ -255,7 +255,7 @@
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
     CFLAGS_unix := -UDEBUG, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
-    LDFLAGS := $(LDFLAGS_JDKLIB) \
+    LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \
         -export:JIMAGE_PackageToModule \