diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-03 23:04:16 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-03 23:04:16 +0000 |
| commit | 6c3f291ba17bd178562a16ac157aef7bb2dbd958 (patch) | |
| tree | c7986ab91c65cd102449cc258fb966b95038b76c | |
| parent | c503845053cb7bf43e790a9221c1242b74864ace (diff) | |
| download | ruby-6c3f291ba17bd178562a16ac157aef7bb2dbd958.tar.gz ruby-6c3f291ba17bd178562a16ac157aef7bb2dbd958.tar.xz ruby-6c3f291ba17bd178562a16ac157aef7bb2dbd958.zip | |
* ext/extmk.rb (extmake): should not modify $mflags for each
extentions.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Aug 4 08:03:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (extmake): should not modify $mflags for each + extentions. + Thu Aug 4 00:25:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated diff --git a/ext/extmk.rb b/ext/extmk.rb index c63236c59..73cd6a1d5 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,7 @@ SRC $extpath.delete("$(topdir)") $extflags = libpathflag($extpath) << " " << $extflags.strip conf = [ - ['SETUP', $setup], [$enable_shared ? 'DLDOBJS' : 'EXTOBJS', $extobjs], + ['SETUP', $setup], [$enable_shared && !$force_static ? 'DLDOBJS' : 'EXTOBJS', $extobjs], ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags] ].map {|n, v| "#{n}=#{v}" if v and !(v = v.strip).empty? @@ -456,6 +456,9 @@ puts "making #{rubies.join(', ')}" $stdout.flush $mflags.concat(rubies) +if $nmake == ?b + $mflags.collect {|flag| flag.sub!(/\A(?=\w+=)/, "-D")} +end system($make, *sysquote($mflags)) or exit($?.exitstatus) #Local variables: |