You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ad...@apache.org on 2019/12/09 04:16:01 UTC

[kudu] 01/05: [build-support] fix on enable_devtoolset_inner.sh, take two

This is an automated email from the ASF dual-hosted git repository.

adar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git

commit 5b9289a6c90bfe7ebed5510aacf45f7005c64490
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Tue Dec 3 19:03:05 2019 -0800

    [build-support] fix on enable_devtoolset_inner.sh, take two
    
    Prior to this fix, when configuring a build via cmake as described at
    https://kudu.apache.org/docs/installation.html#build_from_source,
    the following error was output (at least by bash 4.1.2):
    
      build-support/enable_devtoolset_inner.sh: line 28: [: too many arguments
    
    This is a follow-up to 719418a60235a5155efe95c37e9fc6e319f41e0c.
    
    Change-Id: I8de79a99a5386e47e968ca9e8f6939159b06fbda
    Reviewed-on: http://gerrit.cloudera.org:8080/14825
    Tested-by: Kudu Jenkins
    Reviewed-by: Andrew Wong <aw...@cloudera.com>
---
 build-support/enable_devtoolset_inner.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-support/enable_devtoolset_inner.sh b/build-support/enable_devtoolset_inner.sh
index 5866ab2..0b0ba91 100755
--- a/build-support/enable_devtoolset_inner.sh
+++ b/build-support/enable_devtoolset_inner.sh
@@ -25,7 +25,7 @@ set -e
 
 # If ccache was on the PATH and CC/CXX have not already been set, set them to
 # devtoolset-3 specific ccache helper scripts (thus enabling ccache).
-if which ccache > /dev/null 2>&1 && [ -a ! "$CC" -a ! "$CXX" ]; then
+if which ccache > /dev/null 2>&1 && [ ! "$CC" -a ! "$CXX" ]; then
   ROOT=$(cd $(dirname "$BASH_SOURCE") ; pwd)
   export CC="$ROOT/ccache-devtoolset-3/cc"
   export CXX="$ROOT/ccache-devtoolset-3/c++"