diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-30 09:33:03 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-30 09:33:03 +0000 |
| commit | 9a8cc1f4abdeacb4adf1a7b59fe2bd6f4ea0ad70 (patch) | |
| tree | 53bdbfa1fe9a3862ecc2c4733ec0385e1aa014bc /lib | |
| parent | 53dd83eebd58dc4bc537ce1cf476a66b5e1f6b1c (diff) | |
* configure.in: do not override CCDLDFLAGS, LDFLAGS, XLDFLAGS,
DLDFLAGS and LDSHARED.
* configure.in: XCFLAGS for compiling ruby itself. ARCH_FLAG is
reflected in CFLAGS.
* lib/mkmf.rb: ditto. do not import XCFLAGS from config.status.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 15a74aec16..4628cb51c0 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -215,7 +215,6 @@ def link_command(ldflags, opt="", libpath=$LIBPATH) 'INCFLAGS' => $INCFLAGS, 'CPPFLAGS' => $CPPFLAGS, 'CFLAGS' => "#$CFLAGS", - 'XCFLAGS' => "#$XCFLAGS", 'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LIBPATH' => libpathflag(libpath), 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", @@ -224,7 +223,7 @@ end def cc_command(opt="") "$(CC) -c #$INCFLAGS -I#{$hdrdir} " \ - "#$CPPFLAGS #$CFLAGS #$XCFLAGS #{opt} #{CONFTEST_C}" + "#$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C}" end def cpp_command(outfile, opt="") @@ -721,7 +720,7 @@ LIBRUBY_A = #{CONFIG['LIBRUBY_A']} LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC -CFLAGS = #{CONFIG['CCDLFLAGS'] unless $static} #{CONFIG['XCFLAGS']} #$CFLAGS +CFLAGS = #{CONFIG['CCDLFLAGS'] unless $static} #$CFLAGS CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{$CPPFLAGS} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} DLDFLAGS = #$LDFLAGS #{CONFIG['DLDFLAGS']} #$DLDFLAGS @@ -944,7 +943,6 @@ def init_mkmf(config = CONFIG) $enable_shared = config['ENABLE_SHARED'] == 'yes' $defs = [] $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup - $XCFLAGS = config['XCFLAGS'].dup $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup $LDFLAGS = (with_config("ldflags") || "").dup $INCFLAGS = "-I#{$topdir}" |