From 937343d0d3967a176899f7c1a03294a0f36d77fb Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Tue, 12 Feb 2013 09:27:47 -0700
Subject: [PATCH] don't specify -Wl,-rpath argument on Darwin or Windows (take
 2)

---
 makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index bfe755c23a..7ca50ab600 100755
--- a/makefile
+++ b/makefile
@@ -267,7 +267,7 @@ build-ld = $(build-cc)
 static = -static
 shared = -shared
 
-rpath = -Wl,-rpath=\$$ORIGIN
+rpath = -Wl,-rpath=\$$ORIGIN -Wl,-z,origin
 
 no-error = -Wno-error
 
@@ -1573,7 +1573,7 @@ ifdef mt
 	$(mt) -nologo -manifest $(@).manifest -outputresource:"$(@);1"
 endif
 else
-	$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) $(rpath) -z origin -o $(@)
+	$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) $(rpath) -o $(@)
 endif
 	$(strip) $(strip-all) $(@)