mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
.travis.yml: avoid bashism
GCC_FLAGS is not an array and CC is finally passed to configure as single string. Pass CC via the environment variable, so it does not need to be quoted anymore. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b6854df429
commit
186ff0eb3e
1 changed files with 3 additions and 3 deletions
|
@ -336,11 +336,11 @@ before_script:
|
||||||
- "ccache --show-stats"
|
- "ccache --show-stats"
|
||||||
- |-
|
- |-
|
||||||
case "$CC" in
|
case "$CC" in
|
||||||
gcc*) the_gcc=(ccache $CC ${GCC_FLAGS[@]} -fno-diagnostics-color) ;;
|
gcc*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
|
||||||
clang*) the_gcc=(ccache $CC ${GCC_FLAGS[@]} -fno-color-diagnostics) ;;
|
clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
|
||||||
esac
|
esac
|
||||||
- "[ ! -f config.cache ] || [ \"$CC\" = \"`sed -n s/^ac_cv_prog_CC=//p config.cache`\" ] || (set -x; exec rm config.cache)"
|
- "[ ! -f config.cache ] || [ \"$CC\" = \"`sed -n s/^ac_cv_prog_CC=//p config.cache`\" ] || (set -x; exec rm config.cache)"
|
||||||
- "$SETARCH ../configure -C --disable-install-doc --prefix=/tmp/ruby-prefix --with-gcc=\"${the_gcc[*]}\" $CONFIG_FLAG"
|
- "$SETARCH ../configure -C --disable-install-doc --prefix=/tmp/ruby-prefix $CONFIG_FLAG"
|
||||||
- "cp -pr config.cache config.status .ext/include ../config_1st"
|
- "cp -pr config.cache config.status .ext/include ../config_1st"
|
||||||
- "$SETARCH make reconfig"
|
- "$SETARCH make reconfig"
|
||||||
- "cp -pr config.cache config.status .ext/include ../config_2nd"
|
- "cp -pr config.cache config.status .ext/include ../config_2nd"
|
||||||
|
|
Loading…
Reference in a new issue