aboutsummaryrefslogtreecommitdiffstats
path: root/ext/extmk.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-04 15:20:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-04 15:20:10 +0000
commit7c2dad9c1f57f94851c9b212d5e1cd53ef07ba88 (patch)
tree880d744a857fef892a586b9e45e64e9eebfeaa3b /ext/extmk.rb
parent710b99a16b9093e2542e8e8a76999fb6b4b6c643 (diff)
downloadruby-7c2dad9c1f57f94851c9b212d5e1cd53ef07ba88.tar.gz
* extmk.rb (extmake): needs to be wrapped in an Array.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb')
-rw-r--r--ext/extmk.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 73cd6a1d5f..fc1a2f37ce 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -158,7 +158,7 @@ def extmake(target)
end
args = sysquote($mflags)
unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
- args += sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))
+ args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
end
if $static
args += ["static"] unless $clean
@@ -429,7 +429,8 @@ SRC
$extpath.delete("$(topdir)")
$extflags = libpathflag($extpath) << " " << $extflags.strip
conf = [
- ['SETUP', $setup], [$enable_shared && !$force_static ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
+ ['SETUP', $setup],
+ [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
].map {|n, v|
"#{n}=#{v}" if v and !(v = v.strip).empty?