diff options
Diffstat (limited to 'couchjs')
| -rw-r--r-- | couchjs/c_src/SConscript | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/couchjs/c_src/SConscript b/couchjs/c_src/SConscript index a3e0cc07..4fc9e5a3 100644 --- a/couchjs/c_src/SConscript +++ b/couchjs/c_src/SConscript @@ -13,7 +13,6 @@ # the License. import os import commands -import subprocess def require_lib(name): if not conf.CheckLib(name): @@ -23,7 +22,7 @@ def require_lib(name): def runcmd(cmd): return commands.getstatusoutput(cmd) -env = Environment(CC="c++", CCFLAGS='-g -O2 -DXP_UNIX') +env = Environment(CCFLAGS='-g -O2 -DXP_UNIX') if os.uname()[0] == 'SunOS': env['CC'] = '/usr/sfw/bin/gcc' @@ -89,7 +88,7 @@ if not env.GetOption('clean'): ## Define properties for -h / -V - vsn = subprocess.check_output(["git","describe","--match","1.*"]) + (_, vsn) = runcmd("git describe --match 1.*") conf.Define("PACKAGE_STRING", '"%s"' % vsn.rstrip()) conf.Define("PACKAGE_NAME", '"Cloudant BigCouch"') conf.Define("PACKAGE_BUGREPORT", '"https://github.com/cloudant/bigcouch/issues"') |