diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 01:39:43 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 01:39:43 +0000 |
| commit | d22e2877631257013dcd92f3428e259723783dd0 (patch) | |
| tree | 825af8f96da31147f1635897accbd73be1a2c6f7 /lib | |
| parent | 9da8b416991a50e56180be84410c8d34e2a732bf (diff) | |
merge revision(s) 33934: [Backport #5975]
* Makefile.in (CFLAGS): append ARCH_FLAG.
* configure.in (ARCH_FLAG): exclude from CFLAGS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 59c2c8509a..686a61fb96 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1694,7 +1694,7 @@ cflags = #{CONFIG['cflags']} optflags = #{CONFIG['optflags']} debugflags = #{CONFIG['debugflags']} warnflags = #{$warnflags} -CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG +CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS $(ARCH_FLAG) INCFLAGS = -I. #$INCFLAGS DEFS = #{CONFIG['DEFS']} CPPFLAGS = #{extconf_h}#{$CPPFLAGS} @@ -1702,7 +1702,7 @@ CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} ldflags = #{$LDFLAGS} dldflags = #{$DLDFLAGS} ARCH_FLAG = #{$ARCH_FLAG} -DLDFLAGS = $(ldflags) $(dldflags) +DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) LDSHARED = #{CONFIG['LDSHARED']} LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'} AR = #{CONFIG['AR']} |