diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-31 15:17:53 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-31 15:17:53 +0000 |
| commit | 145a40c40407a1a3af2e79d738efdca4c0f6a8eb (patch) | |
| tree | c60bd25550143cdb22b2d0a9f925c318ed4ba07a | |
| parent | a45d739932e78c2eba63b7a4ef45efd0bc049320 (diff) | |
| parent | c36252fca2a870d8e6de3c11fbfcb253b6a157ec (diff) | |
I don't understand what's happening here, but it seems something went
wrong by a broken working directory. Recover ruby_1_8_7 from v1_8_7.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 38bbe24874..a37bcf65fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,6 @@ CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ EXTLDFLAGS = XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS) -warnflags = @warnflags@ EXTLIBS = LIBS = @LIBS@ $(EXTLIBS) MISSING = @LIBOBJS@ @ALLOCA@ diff --git a/configure.in b/configure.in index 821b74ed50..d5e5be9e86 100644 --- a/configure.in +++ b/configure.in @@ -156,16 +156,13 @@ AC_ARG_PROGRAM dnl Checks for programs. -: ${CFLAGS=} ${CXXFLAGS=} if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) fi AC_PROG_CC AC_PROG_GCC_TRADITIONAL -test $ac_cv_prog_cc_g = yes && : ${debugflags=-g} if test "$GCC" = yes; then linker_flag=-Wl, - : ${optflags=-O2} ${warnflags="-Wall -Wno-parentheses"} else linker_flag= fi @@ -1641,10 +1638,9 @@ CPPFLAGS="$CPPFLAGS "'$(DEFS)' test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}' test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' AC_SUBST(cppflags, [])dnl -AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl +AC_SUBST(cflags, ['${optflags} ${debugflags}'])dnl AC_SUBST(optflags)dnl AC_SUBST(debugflags)dnl -AC_SUBST(warnflags)dnl AC_SUBST(XCFLAGS)dnl AC_SUBST(XLDFLAGS)dnl AC_SUBST(LIBRUBY_LDSHARED) |