diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-27 18:17:07 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-27 18:17:07 +0000 |
| commit | 991ac56c125e9b62bd1d024156b2138eebcf09ac (patch) | |
| tree | 7f4565b2e84c973370c3c944b323210800fb6466 /lib | |
| parent | c16b9028e7c02b78b10d4d68499610badd418d77 (diff) | |
| download | ruby-991ac56c125e9b62bd1d024156b2138eebcf09ac.tar.gz ruby-991ac56c125e9b62bd1d024156b2138eebcf09ac.tar.xz ruby-991ac56c125e9b62bd1d024156b2138eebcf09ac.zip | |
* lib/mkmf.rb (link_command, cc_command, cpp_command): should not
override extout defined in extmk.rb.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 9153a3510..a9dc12067 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -372,7 +372,6 @@ end def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => CONFTEST_C, - 'extout' => $extout, 'arch_hdrdir' => "#$arch_hdrdir", 'top_srcdir' => $top_srcdir.quote, 'INCFLAGS' => "#$INCFLAGS", @@ -388,7 +387,6 @@ end def cc_command(opt="") conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote, - 'extout' => $extout, 'arch_hdrdir' => "#$arch_hdrdir", 'top_srcdir' => $top_srcdir.quote) RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}", @@ -397,7 +395,6 @@ end def cpp_command(outfile, opt="") conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote, - 'extout' => $extout, 'arch_hdrdir' => "#$arch_hdrdir", 'top_srcdir' => $top_srcdir.quote) RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", |