From 186ff0eb3e03c066deddb49769b22a8d1ab350ee Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 27 Nov 2018 08:39:40 +0000 Subject: .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 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 5fc4486aa9..d5b95e808a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -336,11 +336,11 @@ before_script: - "ccache --show-stats" - |- case "$CC" in - gcc*) the_gcc=(ccache $CC ${GCC_FLAGS[@]} -fno-diagnostics-color) ;; - clang*) the_gcc=(ccache $CC ${GCC_FLAGS[@]} -fno-color-diagnostics) ;; + gcc*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";; + clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";; esac - "[ ! -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" - "$SETARCH make reconfig" - "cp -pr config.cache config.status .ext/include ../config_2nd" -- cgit v1.2.3