summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2007-11-25 15:50:31 -0500
committerJoey Hess <joey@kodama.kitenet.net>2007-11-25 15:50:31 -0500
commitf2e5709a331e28abd962b67bb4a31c1c4be45d28 (patch)
tree0d97545d76f9a039d047cb9cc06c6cebfa2240ca
parent899fb749e98d5c533ba74be6e9dcc617f6436882 (diff)
* Let CC be used to control what compiler is used to build wrappers.
* Use 'cc' instead of gcc as the default compiler.
-rw-r--r--IkiWiki/Wrapper.pm4
-rw-r--r--debian/changelog7
-rw-r--r--doc/usage.mdwn6
3 files changed, 16 insertions, 1 deletions
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 6687cace2..dcf3e5c36 100644
--- 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 ee366a6a8..456d4b908 100644
--- 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 af3634e13..76e293ddc 100644
--- 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)