From: Joey Hess <joey@kitenet.net>
Date: Fri, 20 Jul 2012 16:56:57 +0000 (-0400)
Subject: Split CFLAGS into words when building wrapper. Closes: #682237
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25ea99bc223346607d91b6aa09b1b49bce220518;p=ikiwiki.git

Split CFLAGS into words when building wrapper. Closes: #682237
---

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index c39aa2ef7..769540d29 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -214,7 +214,7 @@ $set_background_command
 EOF
 
 	my @cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
-	push @cc, possibly_foolish_untaint($ENV{CFLAGS}) if exists $ENV{CFLAGS};
+	push @cc, split(' ', possibly_foolish_untaint($ENV{CFLAGS})) if exists $ENV{CFLAGS};
 	if (system(@cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
 		#translators: The parameter is a C filename.
 		error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
diff --git a/debian/changelog b/debian/changelog
index 3a98ed339..a77c42e42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
   * recentchangesdiff: When diffurl is not set, provide inline diffs
     in the recentchanges page, with visibility toggleable via javascript.
     Thanks, Antoine Beaupré
+  * Split CFLAGS into words when building wrapper. Closes: #682237
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400