summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2020-04-08 09:05:32 +0200
committerWerner Lemberg <wl@gnu.org>2020-04-08 09:05:32 +0200
commit11beee855e29757a07320fd60e85de2e8da4e037 (patch)
tree86162ed3345b10a5cfbef56549836687cea8339d
parent7a019a63ed9753772e758beec3cad7c0b74ee2aa (diff)
downloadfreetype2-11beee855e29757a07320fd60e85de2e8da4e037.tar.gz
Allow setting `CC' in Unix build (#58051).
* builds/unix/unix-cc.in (CC): Use `override'. The command line value of `CC' (if any) is stored already in `CCraw'.
-rw-r--r--ChangeLog7
-rw-r--r--builds/unix/unix-cc.in8
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a3a84ef25..f1ca56a85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-04-08 Werner Lemberg <wl@gnu.org>
+
+ Allow setting `CC' in Unix build (#58051).
+
+ * builds/unix/unix-cc.in (CC): Use `override'. The command line
+ value of `CC' (if any) is stored already in `CCraw'.
+
2020-04-04 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com>
[woff2] Return if single stream operation fails.
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 42e5e8df0..470ac23d8 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -87,8 +87,12 @@ ANSIFLAGS := @XX_ANSIFLAGS@
# C compiler to use -- we use libtool!
#
-CCraw := $(CC)
-CC := $(LIBTOOL) --mode=compile $(CCraw)
+# CC might be set on the command line; we store this value in `CCraw'.
+# Consequently, we use the `override' directive to ensure that the
+# libtool call is always prepended.
+#
+CCraw := $(CC)
+override CC := $(LIBTOOL) --mode=compile $(CCraw)
# Resource compiler to use on Cygwin/MinGW, usually windres.
#