* Let CC be used to control what compiler is used to build wrappers.

* Use 'cc' instead of gcc as the default compiler.

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 6687cace221afc7cca17c35d99a85c3557fd9223..dcf3e5c364ba2380ba04f3c78f0fca551f0badc3 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -102,7 +102,9 @@ $envsave
 }
 EOF
        close OUT;
-       if (system("gcc", "$wrapper.c", "-o", "$wrapper.new") != 0) {
+
+       my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
+       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 ee366a6a846ddd234b586453ce4a73f1e76fa81a..456d4b9081be099fd5033e80ba3327bbef32a3f8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (2.14) UNRELEASED; urgency=low
+
+  * Let CC be used to control what compiler is used to build wrappers.
+  * Use 'cc' instead of gcc as the default compiler.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 25 Nov 2007 15:49:49 -0500
+
 ikiwiki (2.13) unstable; urgency=low
 
   The ikiwiki zombie army release.

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index af3634e13b0aa3a8b02d62494e2614c1d5cb373e..76e293ddc0bba09376db65984499717080146705 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -300,6 +300,12 @@ configuration options of their own.
   using command-line switches, you will rarely need to use this, but it can be
   useful for the odd option that lacks a command-line switch.
 
+# ENVIRONMENT
+
+* CC
+
+  This controls what C compiler is used to build wrappers. Default is 'cc'.
+
 # SEE ALSO
 
 * [[ikiwiki-mass-rebuild]](8)