diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-10-21 16:27:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-10-21 16:27:47 -0400 |
| commit | b6f6f126d0e3fa23687f2d8c537de207e2c7b5d3 (patch) | |
| tree | 84ba828aad25d8805d7663e60b71494775999c05 | |
| parent | 990a4b99b00c162da218f951041fed50c4259049 (diff) | |
| download | ikiwiki-b6f6f126d0e3fa23687f2d8c537de207e2c7b5d3.tar ikiwiki-b6f6f126d0e3fa23687f2d8c537de207e2c7b5d3.tar.gz | |
avoid -O default for CFLAGS, and document
| -rw-r--r-- | IkiWiki/Wrapper.pm | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/usage.mdwn | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 7a1529119..5427a5c80 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -142,9 +142,9 @@ $pre_exec } EOF - my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc'; - my $cflags=exists $ENV{CFLAGS} ? possibly_foolish_untaint($ENV{CFLAGS}) : '-O'; - if (system($cc, $cflags, "$wrapper.c", "-o", "$wrapper.new") != 0) { + my @cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc'; + push @cc, 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 f6739952e..0ff7a0d13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low * edittemplate: Work around bug #551499 in CGI::FormBuilder. * Fix a bug introduced in the last version that caused ikiwiki to skip all files if a sourcedir of "./" was specified. + * Support CFLAGS when building wrapper. -- Joey Hess <joeyh@debian.org> Sun, 18 Oct 2009 13:44:09 -0400 diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 0c618de5c..4ee935f73 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -345,6 +345,10 @@ also be configured using a setup file. This controls what C compiler is used to build wrappers. Default is 'cc'. +* CFLAGS + + This can be used to pass options to the C compiler when building wrappers. + # SEE ALSO * [[ikiwiki-mass-rebuild]](8) |