build: fixed issue with CC="ccache cc" on solaris

3 files changed, 11 insertions, 5 deletions

diff --git a/buildtools/waf-svn b/buildtools/waf-svn
index 983a5a9e68..7dbc81a86c 100755
--- a/buildtools/waf-svn
+++ b/buildtools/waf-svn
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index e91409e0a4..1c1095ea47 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -418,3 +418,13 @@ def CHECK_RPATH_SUPPORT(conf):
                            execute=True,
                            msg='Checking for rpath support',
                            cflags='-Wl,-rpath=.')
+
+@conf
+def CHECK_CC_ENV(conf):
+    '''trim whitespaces from 'CC'.
+    The build farm sometimes puts a space at the start'''
+    if os.environ.get('CC'):
+        conf.env.CC = TO_LIST(os.environ.get('CC'))
+        if len(conf.env.CC) == 1:
+            # make for nicer logs if just a single command
+            conf.env.CC = conf.env.CC[0]
diff --git a/lib/replace/wscript b/lib/replace/wscript
index d54e18b26b..97e5534d5d 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -57,11 +57,7 @@ def configure(conf):
     # load our local waf extensions
     conf.check_tool('wafsamba', tooldir=conf.srcdir + "/buildtools/wafsamba")
 
-    # trim whitespaces from 'CC'.
-    # The build farm sometimes puts a space at the start
-    if os.environ.get('CC'):
-        conf.env['CC'] = os.environ.get('CC').strip()
-        os.environ['CC'] = conf.env['CC']
+    conf.CHECK_CC_ENV()
 
     conf.check_tool('compiler_cc')