summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-20 16:00:52 -0400
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:55 +1000
commit4b68550642098f42b8fb3d7b08b6d6f475bb3d34 (patch)
tree2d7a5f5cbac496af956ace2830a5466bbd183ca0
parent86cfbbafcdc42acd1d37fb152ab123453bd985fa (diff)
downloadsamba-4b68550642098f42b8fb3d7b08b6d6f475bb3d34.tar.gz
samba-4b68550642098f42b8fb3d7b08b6d6f475bb3d34.tar.bz2
samba-4b68550642098f42b8fb3d7b08b6d6f475bb3d34.zip
build: also need to put stripped CC in conf.env
-rw-r--r--lib/replace/wscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 575dcf9ac2..f9d051434f 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -57,7 +57,8 @@ def configure(conf):
# trim whitespaces from 'CC'.
# The build farm sometimes puts a space at the start
if os.environ.get('CC'):
- os.environ['CC'] = os.environ.get('CC').strip()
+ conf.env['CC'] = os.environ.get('CC').strip()
+ os.environ['CC'] = conf.env['CC']
conf.check_tool('compiler_cc')