summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-12-07 06:52:31 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-12-07 06:52:31 +0000
commit1354ff60cd96c4c6b9b9d9ef4ba23a6f538453ad (patch)
treea38b21c4606edff089f8f7cca0ab1fcfada7d861
parente85a18e8e09364c9516d08feb913c33e4cfcb19d (diff)
downloadruby-1354ff60cd96c4c6b9b9d9ef4ba23a6f538453ad.tar.gz
ruby-1354ff60cd96c4c6b9b9d9ef4ba23a6f538453ad.tar.xz
ruby-1354ff60cd96c4c6b9b9d9ef4ba23a6f538453ad.zip
* ext/extmk.rb.in: ignore adding -Wl,-R to DLDFLAGS when the directory
is $topdir. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/extmk.rb.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1970729fa..059362303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 7 15:49:39 2001 Usaku Nakamura <usa@ruby-lang.org>
+
+ * ext/extmk.rb.in: ignore adding -Wl,-R to DLDFLAGS when the directory
+ is $topdir.
+
Thu Dec 6 18:52:28 2001 Usaku Nakamura <usa@ruby-lang.org>
* ext/extmk.rb.in: add -Wl,-R flags to DLDFLAGS on netbsdelf.
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 534fe36c6..0652ac2e0 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -402,7 +402,7 @@ def create_makefile(target)
else
$LIBPATH.each {|d| $DLDFLAGS << " -L" << d}
if /netbsdelf/ =~ RUBY_PLATFORM
- $LIBPATH.each {|d| $DLDFLAGS << " -Wl,-R" + d}
+ $LIBPATH.each {|d| $DLDFLAGS << " -Wl,-R" + d unless d == $topdir}
end
end