summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-16 11:14:54 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-16 11:14:54 +0100
commit9e4c091e6ef0f79fab10664e95240de2f14e5702 (patch)
tree0929399880e571b1ac4e30abd286958fb0a67361 /cscript
parentea8c3dca0730a3e50a7b2788a4b79c4b521cef4b (diff)
parent5598e0dfbae48463130323c6a3bcd3eb9683f21e (diff)
Merge master.
Diffstat (limited to 'cscript')
-rw-r--r--cscript5
1 files changed, 4 insertions, 1 deletions
diff --git a/cscript b/cscript
index 0c27e59fe..2ac5fea91 100644
--- a/cscript
+++ b/cscript
@@ -169,7 +169,10 @@ def build(target, options):
if target.version == 'unstable':
cmd += ' --debian-unstable'
elif target.distro == 'centos':
- cmd += ' --target-centos'
+ if target.version == '6.5':
+ cmd += ' --target-centos-6 --disable-tests'
+ elif target.version == '7':
+ cmd += ' --target-centos-7'
target.command(cmd)
target.command('./waf')