From 99020d6e50702eb371111d73280eb80b4b29ba5b Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 25 Dec 2000 06:29:27 +0000 Subject: 001225 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/mkmf.rb') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 788a957792..317200ba79 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -44,7 +44,7 @@ else end LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}" -CPP = "#{CONFIG['CPP']} -E -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c" +CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c" def rm_f(*files) targets = [] @@ -104,7 +104,7 @@ def try_cpp(src, opt="") cfile.print src cfile.close begin - xsystem(format(CPP, $CFLAGS, opt)) + xsystem(format(CPP, $CPPFLAGS, $CFLAGS, opt)) ensure rm_f "conftest*" end @@ -115,7 +115,7 @@ def egrep_cpp(pat, src, opt="") cfile.print src cfile.close begin - xsystem(format(CPP+"|egrep #{pat}", $CFLAGS, opt)) + xsystem(format(CPP+"|egrep #{pat}", $CPPFLAGS, $CFLAGS, opt)) ensure rm_f "conftest*" end -- cgit v1.2.1