From 11beee855e29757a07320fd60e85de2e8da4e037 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 8 Apr 2020 09:05:32 +0200 Subject: [PATCH] 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'. --- ChangeLog | 7 +++++++ builds/unix/unix-cc.in | 8 ++++++-- 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 + + 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 [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. #