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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index c39aa2ef7d678207ef86c938baef3f7af1933c30..769540d29ac3de34715436ead21416747d3b09b4 100644 (file)
--- 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';
 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"));
        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 3a98ed3397cf40168e7bb95e88984ff9e84ed36e..a77c42e425f88f2f4864214a38958ceb85497f58 100644 (file)
--- 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é
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400