diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-01 06:43:55 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-01 06:43:55 +0000 |
| commit | 35f33d70f8d5c69293c2b721a548db768a9f61a0 (patch) | |
| tree | 2b1f6e967e0e2dd34ba02df783df1958ff6a01b4 | |
| parent | 6508307abb0cbbb8089aa1f019c2a2cb0fae7929 (diff) | |
* lib/mkmf.rb: Fix build. COUTFLAG is not yet landed on this
branch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Fri Jan 1 15:42:46 2010 Akinori MUSHA <knu@iDaemons.org> + + * lib/mkmf.rb: Fix build. COUTFLAG is not yet landed on this + branch. + Fri Jan 1 00:47:57 2010 Akinori MUSHA <knu@iDaemons.org> * ext/digest/digest.c (rb_digest_instance_method_unimpl): Suppress diff --git a/lib/mkmf.rb b/lib/mkmf.rb index f705b33b9c..bef627ab02 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -171,7 +171,6 @@ else end OUTFLAG = CONFIG['OUTFLAG'] -COUTFLAG = CONFIG['COUTFLAG'] CPPOUTFILE = CONFIG['CPPOUTFILE'] CONFTEST_C = "conftest.c".freeze @@ -1457,7 +1456,6 @@ LIBRUBY_A = #{CONFIG['LIBRUBY_A']} LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC OUTFLAG = #{OUTFLAG} -COUTFLAG = #{COUTFLAG} RUBY_EXTCONF_H = #{$extconf_h} cflags = #{CONFIG['cflags']} @@ -1997,8 +1995,8 @@ COMMON_LIBS = config_string('COMMON_LIBS', &split) || [] COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:] RULE_SUBST = config_string('RULE_SUBST') -COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<' -COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<' +COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(OUTFLAG)$@ -c $<' +COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(OUTFLAG)$@ -c $<' TRY_LINK = config_string('TRY_LINK') || "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \ "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)" |