--- old/make/autoconf/lib-clang.m4	2018-04-20 16:25:05.000000000 -0700
+++ new/make/autoconf/lib-clang.m4	2018-04-20 16:25:04.000000000 -0700
@@ -61,7 +61,7 @@
         LIBCLANG_CPPFLAGS=""
     fi
     if test "x$CLANG_LIB_PATH" != "x"; then
-        LIBCLANG_LDFLAGS="-L$CLANG_LIB_PATH -Wl,-rpath,$CLANG_LIB_PATH"
+        LIBCLANG_LDFLAGS="-L$CLANG_LIB_PATH"
     else
         LIBCLANG_LDFLAGS=""
     fi
--- old/make/lib/Lib-jdk.internal.clang.gmk	2018-04-20 16:25:06.000000000 -0700
+++ new/make/lib/Lib-jdk.internal.clang.gmk	2018-04-20 16:25:06.000000000 -0700
@@ -52,4 +52,11 @@
 
   TARGETS += $(BUILD_LIBJCLANG)
 
+  $(eval $(call SetupCopyFiles, COPY_CLANG_LIB, \
+      FILES := $(CLANG_LIB_PATH)/$(LIBRARY_PREFIX)clang$(SHARED_LIBRARY_SUFFIX), \
+      DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
+  ))
+
+  TARGETS += $(COPY_CLANG_LIB)
+
 endif