summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-13 15:32:07 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-13 15:32:07 +0000
commite4fde97bf6d479194cb8b3a12b9f64d41f754e84 (patch)
tree488f202799f093b375190f333a2b30afdbd474ed /cscript
parentdc4b34424426c9d1acac00f4274312ee8edc715a (diff)
parent8364c00735ac3912ffc8d61828db94ef9f537a60 (diff)
Fix conflict.
Diffstat (limited to 'cscript')
-rw-r--r--cscript2
1 files changed, 2 insertions, 0 deletions
diff --git a/cscript b/cscript
index 9647154..a9ddb05 100644
--- a/cscript
+++ b/cscript
@@ -9,6 +9,8 @@ def build(target, options):
cmd += ' --static'
if target.distro == 'centos':
cmd += ' --disable-tests'
+ if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
+ target.append_with_space('CXXFLAGS', '-std=c++11')
if target.debug:
cmd += ' --enable-debug'
if target.platform == 'windows':