diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-04 15:20:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-04 15:20:10 +0000 |
| commit | cf144c5a545476f28f1464785f9a6b0908ef8468 (patch) | |
| tree | 880d744a857fef892a586b9e45e64e9eebfeaa3b /ext | |
| parent | a4c72d8d3f73163075bc28d1a03b696dc75e7383 (diff) | |
| download | ruby-cf144c5a545476f28f1464785f9a6b0908ef8468.tar.gz ruby-cf144c5a545476f28f1464785f9a6b0908ef8468.tar.xz ruby-cf144c5a545476f28f1464785f9a6b0908ef8468.zip | |
* extmk.rb (extmake): needs to be wrapped in an Array.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 73cd6a1d5..fc1a2f37c 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? |