From 40fa69f0f370146d9b85dfc5990b612b6d9d1ce9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 5 Sep 2019 10:32:46 +0100 Subject: [PATCH] Build: do not override the system "cc", on Linux and OpenBSD --- src/OS/Makefile-Linux | 2 ++ src/OS/Makefile-OpenBSD | 1 + 2 files changed, 3 insertions(+) diff --git a/src/OS/Makefile-Linux b/src/OS/Makefile-Linux index 990f884e9..cbbe01fe0 100644 --- a/src/OS/Makefile-Linux +++ b/src/OS/Makefile-Linux @@ -12,6 +12,8 @@ CHOWN_COMMAND=look_for_it CHGRP_COMMAND=look_for_it CHMOD_COMMAND=look_for_it +# The system cc may be gcc or clang; do not force gcc +CC=cc # Preserve CFLAGS and CFLAGS_DYNAMIC from the caller/environment CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE CFLAGS_DYNAMIC ?= -shared -rdynamic diff --git a/src/OS/Makefile-OpenBSD b/src/OS/Makefile-OpenBSD index 2b37a7373..8bff1b058 100644 --- a/src/OS/Makefile-OpenBSD +++ b/src/OS/Makefile-OpenBSD @@ -4,6 +4,7 @@ CHOWN_COMMAND=/usr/sbin/chown CHGRP_COMMAND=/usr/sbin/chgrp CHMOD_COMMAND=/bin/chmod +CC=cc CFLAGS=-O2 -Wall -Wno-parentheses -Wno-self-assign -Wno-logical-op-parentheses CFLAGS += -DTAINT_CHECK_SLOW -- 2.25.1