mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/mkmf.rb (link_command, cc_command, cpp_command): should not
override extout defined in extmk.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a8eaf31630
commit
72122dd947
3 changed files with 7 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
Sat Mar 28 03:16:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* lib/mkmf.rb (link_command, cc_command, cpp_command): should no
|
||||
override extout defined in extmk.rb.
|
||||
|
||||
Fri Mar 27 12:56:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* lib/mkmf.rb (what_type?): checks more restrictively, and
|
||||
|
|
|
@ -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}",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#define RUBY_VERSION "1.9.2"
|
||||
#define RUBY_RELEASE_DATE "2009-03-27"
|
||||
#define RUBY_RELEASE_DATE "2009-03-28"
|
||||
#define RUBY_PATCHLEVEL -1
|
||||
#define RUBY_BRANCH_NAME "trunk"
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
|||
#define RUBY_VERSION_TEENY 1
|
||||
#define RUBY_RELEASE_YEAR 2009
|
||||
#define RUBY_RELEASE_MONTH 3
|
||||
#define RUBY_RELEASE_DAY 27
|
||||
#define RUBY_RELEASE_DAY 28
|
||||
|
||||
#ifdef RUBY_EXTERN
|
||||
RUBY_EXTERN const char ruby_version[];
|
||||
|
|
Loading…
Reference in a new issue