git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86cfbba
)
build: also need to put stripped CC in conf.env
author
Andrew Tridgell
<tridge@samba.org>
Sat, 20 Mar 2010 20:00:52 +0000
(16:00 -0400)
committer
Andrew Tridgell
<tridge@samba.org>
Tue, 6 Apr 2010 10:26:55 +0000
(20:26 +1000)
lib/replace/wscript
patch
|
blob
|
history
diff --git
a/lib/replace/wscript
b/lib/replace/wscript
index 575dcf9ac228fc71cafa5b005edb49a0f7fde849..f9d051434ff8456a968a3ae3b573d77ca6df389d 100644
(file)
--- 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')