diff options
author | Loïc Minier <lool@dooz.org> | 2010-01-22 16:06:41 +0200 |
---|---|---|
committer | Stefan Kost <ensonic@users.sf.net> | 2010-01-22 16:06:41 +0200 |
commit | b37791867f938d9ab5ce5d3db63d7115981deb7a (patch) | |
tree | 0a655e66d422116d53131d7edf2c057bd8d51d10 /gtkdoc-scangobj.in | |
parent | b784c5fec02da0baa91e685e9c3adecdbe3f403b (diff) | |
download | gtk-doc-b37791867f938d9ab5ce5d3db63d7115981deb7a.tar.gz |
scanobj/gobj: Execute system() calls in subshells, Fixes #607531
the tools already execute one command in a subshell so that if it fails,
we can still see the errors. It doesn't for other commands though (like the
compiler or the linker).
Diffstat (limited to 'gtkdoc-scangobj.in')
-rw-r--r-- | gtkdoc-scangobj.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in index fe25252..f3b4b45 100644 --- a/gtkdoc-scangobj.in +++ b/gtkdoc-scangobj.in @@ -1598,15 +1598,14 @@ if ($CC =~ /libtool/) { print "gtk-doc: Compiling scanner\n"; $command = "$CC $CFLAGS -c -o $o_file $MODULE-scan.c"; -system($command) == 0 or die "Compilation of scanner failed: $!\n"; +system("($command)") == 0 or die "Compilation of scanner failed: $!\n"; print "gtk-doc: Linking scanner\n"; $command = "$LD -o $MODULE-scan $o_file $LDFLAGS"; -system($command) == 0 or die "Linking of scanner failed: $!\n"; +system("($command)") == 0 or die "Linking of scanner failed: $!\n"; print "gtk-doc: Running scanner $MODULE-scan\n"; -# use sh -c to avoid terminating the whole run without seeing the error -system("sh -c \"$RUN ./$MODULE-scan\"") == 0 or die "Scan failed: $!\n"; +system("(./$MODULE-scan)") == 0 or die "Scan failed: $!\n"; if (!defined($ENV{"GTK_DOC_KEEP_INTERMEDIATE"})) { unlink "./$MODULE-scan.c", "./$MODULE-scan.o", "./$MODULE-scan.lo", "./$MODULE-scan"; |