archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand

Browse source 
::CONFIG which is an alias of MAKEFILE_CONFIG.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-07-13 01:10:48 +00:00
parent 420a5fe48e
commit 22c20cd4d9
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jul 13 10:10:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
::CONFIG which is an alias of MAKEFILE_CONFIG.
Thu Jul 12 17:03:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jul 12 17:03:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* struct.c (rb_struct_init_copy): disallow changing the size. * struct.c (rb_struct_init_copy): disallow changing the size.

12
lib/mkmf.rb
View file

@ -271,8 +271,7 @@ ensure
end end
def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
Config::expand(TRY_LINK.dup, conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote,
CONFIG.merge('hdrdir' => $hdrdir.quote,
'src' => CONFTEST_C, 'src' => CONFTEST_C,
'INCFLAGS' => $INCFLAGS, 'INCFLAGS' => $INCFLAGS,
'CPPFLAGS' => $CPPFLAGS, 'CPPFLAGS' => $CPPFLAGS,
@ -281,17 +280,20 @@ def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
'LIBPATH' => libpathflag(libpath), 'LIBPATH' => libpathflag(libpath),
'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")) 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
Config::expand(TRY_LINK.dup, conf)
end end
def cc_command(opt="") def cc_command(opt="")
conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)
Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}", Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) conf)
end end
def cpp_command(outfile, opt="") def cpp_command(outfile, opt="")
conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)
Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) conf)
end end
def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6" #define RUBY_VERSION "1.8.6"
#define RUBY_RELEASE_DATE "2007-07-12" #define RUBY_RELEASE_DATE "2007-07-13"
#define RUBY_VERSION_CODE 186 #define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070712 #define RUBY_RELEASE_CODE 20070713
#define RUBY_PATCHLEVEL 5000 #define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6 #define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 12 #define RUBY_RELEASE_DAY 13
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];