diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-28 05:43:17 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-28 05:43:17 +0000 |
commit | 54e0b26ecf1ded39a6c2496062106e80430e488d (patch) | |
tree | 1e6519d7b48b2eb3b7b9bea09337d313ca6342b3 /lib/mkmf.rb | |
parent | d9b42dd56b73048227c618d3afd6dad46f38bb04 (diff) |
* ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to
get rid of mixing $LDFLAGS and $ARCH_FLAG.
* lib/mkmf.rb (configuration): ditto.
* lib/mkmf.rb (create_makefile): support for extensions which has no
shared object.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
-rw-r--r-- | lib/mkmf.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index b90ee9a487..35750b5051 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1162,7 +1162,10 @@ INCFLAGS = -I. #$INCFLAGS DEFS = #{CONFIG['DEFS']} CPPFLAGS = #{extconf_h}#{$CPPFLAGS} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} -DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG +ldflags = #{$LDFLAGS} +dldflags = #{$DLDFLAGS} +archflag = #{$ARCH_FLAG} +DLDFLAGS = $(ldflags) $(dldflags) $(archflag) LDSHARED = #{CONFIG['LDSHARED']} AR = #{CONFIG['AR']} EXEEXT = #{CONFIG['EXEEXT']} @@ -1353,11 +1356,11 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} dirs = [] mfile.print "install: install-so install-rb\n\n" sodir = (dir = "$(RUBYARCHDIR)").dup - mfile.print("install-so: #{dir}\n") + mfile.print("install-so: ") if target f = "$(DLLIB)" dest = "#{dir}/#{f}" - mfile.print "install-so: #{dest}\n" + mfile.puts dir, "install-so: #{dest}" unless $extout mfile.print "#{dest}: #{f}\n" if (sep = config_string('BUILD_FILE_SEPARATOR')) @@ -1374,6 +1377,8 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n" end end + else + mfile.puts "Makefile" end mfile.print("install-rb: pre-install-rb install-rb-default\n") mfile.print("install-rb-default: pre-install-rb-default\n") |