X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899..f58f3e1bec41ccf9316f37b014ce0b373c8e49e1:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 53ac5099a..5427a5c80 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -41,9 +41,6 @@ EOF
 	my @wrapper_hooks;
 	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
-	my $check_args="	return 0;";
-	run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
-
 	my $check_commit_hook="";
 	my $pre_exec="";
 	if ($config{post_commit}) {
@@ -116,16 +113,9 @@ addenv(char *var, char *val) {
 	newenviron[i++]=s;
 }
 
-int checkargs(int argc, char **argv) {
-$check_args
-}
-
 int main (int argc, char **argv) {
 	char *s;
 
-	if (!checkargs(argc, argv))
-		exit(0);
-
 $check_commit_hook
 @wrapper_hooks
 $envsave
@@ -152,8 +142,9 @@ $pre_exec
 }
 EOF
 
-	my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
-	if (system($cc, "$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"));
 	}