summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 07:06:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 07:06:19 +0000
commit126abc5c47a2467949021b493b2c742828224b30 (patch)
tree30a0aad496e47dd2ff08b057ad4cfe7d10eeacfc
parentc7144179bbd4a8349bee677e2d9c89b1df52f445 (diff)
* configure.in (CFLAGS, CXXFLAGS): append default flags.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a5ee7ee756..4b62941cb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 7 16:06:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (CFLAGS, CXXFLAGS): append default flags.
+
Sat Jun 7 01:23:59 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int.
diff --git a/configure.in b/configure.in
index 23340e7315..04114d96e5 100644
--- a/configure.in
+++ b/configure.in
@@ -178,8 +178,6 @@ dnl Checks for programs.
: ${CFLAGS=} ${cflags='${optflags} ${debugflags} ${warnflags}'}
: ${CXXFLAGS=} ${cxxflags='${optflags} ${debugflags} ${warnflags}'}
-CFLAGS="${CFLAGS} `eval echo $cflags`"
-CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
if test x"${build}" != x"${host}"; then
AC_CHECK_TOOL(CC, gcc)
fi
@@ -193,6 +191,8 @@ if test "$GCC" = yes; then
else
linker_flag=
fi
+CFLAGS="${CFLAGS} `eval echo $cflags`"
+CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
RUBY_PROG_GNU_LD
RUBY_CPPOUTFILE