From feaf729734032a59cb1f83f8dddfaabcdb44e914 Mon Sep 17 00:00:00 2001 From: Robert Newson Date: Fri, 29 Apr 2011 21:16:20 +0100 Subject: make pkg-config modifications conditional on successful status code. --- couchjs/c_src/SConscript | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'couchjs') diff --git a/couchjs/c_src/SConscript b/couchjs/c_src/SConscript index e9efce60..cfce5605 100644 --- a/couchjs/c_src/SConscript +++ b/couchjs/c_src/SConscript @@ -33,8 +33,12 @@ if os.uname()[0] == 'FreeBSD': env['LIB_COMPAT'] = 'compat' if os.path.exists('/usr/bin/pkg-config'): - env['CCFLAGS'] += commands.getoutput("/usr/bin/pkg-config mozilla-js --cflags") - env.Append(LINKFLAGS=commands.getoutput("/usr/bin/pkg-config mozilla-js --libs-only-L")) + (status, output) = commands.getstatusoutput("/usr/bin/pkg-config mozilla-js --cflags") + if status == 0: + env['CCFLAGS'] += output + (status, output) = commands.getstatusoutput("/usr/bin/pkg-config mozilla-js --libs-only-L") + if status == 0: + env.Append(LINKFLAGS=output) if not env.GetOption('clean'): conf = Configure(env, config_h='config.h') -- cgit v1.2.3