From 426f34c49f4cd7975a68ccb49db1a487b0a1876f Mon Sep 17 00:00:00 2001 From: Mark Allen Date: Mon, 2 Oct 2017 21:02:58 -0500 Subject: Don't stomp on defined CC values --- kerl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/kerl b/kerl index 9bdaedc..a926d4a 100755 --- a/kerl +++ b/kerl @@ -548,8 +548,19 @@ _flags() osver=$(uname -r) case "$osver" in 17*) - host=$(./erts/autoconf/config.guess) - CFLAGS="$CFLAGS" DED_LD="clang" CC="clang" DED_LDFLAGS="-m64 -bundle -bundle_loader ${ERL_TOP}/bin/$host/beam.smp" $@ + # Make sure we don't overwrite values that someone who + # knows better than us set. + if [ -z "$DED_LD" ]; then + DED_LD="clang" + fi + if [ -z "$CC" ]; then + CC="clang" + fi + if [ -z "$DED_LDFLAGS" ]; then + host=$(./erts/autoconf/config.guess) + DED_LDFLAGS="-m64 -bundle -bundle_loader ${ERL_TOP}/bin/$host/beam.smp" + fi + CFLAGS="$CFLAGS" DED_LD="$DED_LD" CC="$CC" DED_LDFLAGS="$DED_LDFLAGS" $@ ;; *) CFLAGS="$CFLAGS" $@ -- cgit v1.2.3