1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in (CFLAGS, CXXFLAGS): include additional flags to

Browse Source 
CFLAGS and CXXFLAGS while configuration.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-04 04:07:01 +00:00
parent 0ecd8c8bc2
commit a76288cfc7
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jun 4 13:06:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (CFLAGS, CXXFLAGS): include additional flags to
CFLAGS and CXXFLAGS while configuration.
Tue Jun 3 23:06:35 2008 Yusuke Endoh <mame@tsg.ne.jp> Tue Jun 3 23:06:35 2008 Yusuke Endoh <mame@tsg.ne.jp>
* ext/strscan/strscan.c (strscan_scan_full, strscan_search_full): fix * ext/strscan/strscan.c (strscan_scan_full, strscan_search_full): fix

10
configure.in
View File

@ -176,7 +176,10 @@ AC_ARG_PROGRAM
dnl Checks for programs. dnl Checks for programs.
: ${CFLAGS=} ${CXXFLAGS=} : ${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 if test x"${build}" != x"${host}"; then
AC_CHECK_TOOL(CC, gcc) AC_CHECK_TOOL(CC, gcc)
fi fi
@ -1730,8 +1733,11 @@ case "$build_os" in
esac esac
CPPFLAGS="$CPPFLAGS "'$(DEFS)' CPPFLAGS="$CPPFLAGS "'$(DEFS)'
test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}'
test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[][|.*]/\\&/g'`
CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'`
cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[][|.*]/\\&/g'`
CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'`
AC_SUBST(cppflags, [])dnl AC_SUBST(cppflags, [])dnl
AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl
AC_SUBST(optflags)dnl AC_SUBST(optflags)dnl

6
version.h
View File

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2008-06-03" #define RUBY_RELEASE_DATE "2008-06-04"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20080603 #define RUBY_RELEASE_CODE 20080604
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 3 #define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];