From c47bb5a80759032bdfd36afc6c1ea90f6a5bf454 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 30 Nov 2003 16:09:42 +0000
Subject: * 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
---
 lib/mkmf.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/mkmf.rb')

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"
-- 
cgit