diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-30 16:09:42 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-30 16:09:42 +0000 |
| commit | c47bb5a80759032bdfd36afc6c1ea90f6a5bf454 (patch) | |
| tree | 8dbacc5a5d3eff1a7654e126ba94e062a3a40ed2 | |
| parent | 4e4efe30b3d04fa61f77e8079ecec6bd89a4a341 (diff) | |
| download | ruby-c47bb5a80759032bdfd36afc6c1ea90f6a5bf454.tar.gz ruby-c47bb5a80759032bdfd36afc6c1ea90f6a5bf454.tar.xz ruby-c47bb5a80759032bdfd36afc6c1ea90f6a5bf454.zip | |
* lib/mkmf.rb (TRY_LINK, link_command): added support for DLDFLAGS
and ARCH_FLAG. [ruby-dev:22085]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Dec 1 01:03:27 2003 WATANABE Hirofumi <eban@ruby-lang.org> + + * lib/mkmf.rb (TRY_LINK, link_command): added support for DLDFLAGS + and ARCH_FLAG. [ruby-dev:22085] + Sun Nov 30 20:18:07 2003 WATANABE Hirofumi <eban@ruby-lang.org> * configure.in: keep ARCH_FLAG separate. export ARCH_FLAG. @@ -9,7 +14,7 @@ Sun Nov 30 20:18:07 2003 WATANABE Hirofumi <eban@ruby-lang.org> * lib/mkmf.rb (link_command, cc_command): use ARCH_FLAG. - * lib/mkfm.rb (configuration): add ARCH_FLAG to DLDFLAGS. + * lib/mkmf.rb (configuration): add ARCH_FLAG to DLDFLAGS. * Makefile.in: add ARCH_FLAG to DLDFLAGS. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 34c9dd4ed..bb79a5e4c 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -217,6 +217,7 @@ def link_command(ldflags, opt="", libpath=$LIBPATH) 'CFLAGS' => "#$CFLAGS", 'ARCH_FLAG' => "#$ARCH_FLAG", 'LDFLAGS' => "#$LDFLAGS #{ldflags}", + 'DLDFLAGS' => "#$DLDFLAGS", 'LIBPATH' => libpathflag(libpath), 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS") @@ -948,7 +949,7 @@ def init_mkmf(config = CONFIG) $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup $LDFLAGS = (with_config("ldflags") || "").dup $INCFLAGS = "-I#{$topdir}" - $DLDFLAGS = (arg_config("DLDFLAGS") || "").dup + $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup $LIBEXT = config['LIBEXT'].dup $OBJEXT = config["OBJEXT"].dup $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}" @@ -1015,7 +1016,7 @@ COMPILE_C = config_string('COMPILE_C') || '$(CC) $(CFLAGS) $(CPPFLAGS) -c $<' COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<' TRY_LINK = config_string('TRY_LINK') || "$(CC) #{OUTFLAG}conftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) " \ - "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(LOCAL_LIBS) $(LIBS)" + "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(DLDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)" LINK_SO = config_string('LINK_SO') || if CONFIG["DLEXT"] == $OBJEXT "ld $(DLDFLAGS) -r -o $(DLLIB) $(OBJS)\n" |