From 8d3d4a4244648dd6703fd5e24a9b508ebc4a22e5 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sun, 10 Jul 2011 17:14:48 +0200 Subject: [PATCH] Revert 9518ab65: Allow user to specify CC env var (CC=clang make) Conditional assignment (assign if not set) to CC and AR never works because their default values with GNU make are `cc` and `ar` respectively. Build with `make AR=your-ar CC=your-cc` if you want to override them. Fixes #89. --- config-mingw.mk | 4 ++-- config-unix.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-mingw.mk b/config-mingw.mk index be8abca1..a115277a 100644 --- a/config-mingw.mk +++ b/config-mingw.mk @@ -20,8 +20,8 @@ # Use make -f Makefile.gcc PREFIX=i686-w64-mingw32- # for cross compilation -CC ?= $(PREFIX)gcc -AR ?= $(PREFIX)ar +CC = $(PREFIX)gcc +AR = $(PREFIX)ar E=.exe CFLAGS=$(CPPFLAGS) -g --std=gnu89 -D_WIN32_WINNT=0x0501 -Isrc/ares/config_win32 diff --git a/config-unix.mk b/config-unix.mk index b132cb5b..2b44dd64 100644 --- a/config-unix.mk +++ b/config-unix.mk @@ -18,8 +18,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -CC ?= $(PREFIX)gcc -AR ?= $(PREFIX)ar +CC = $(PREFIX)gcc +AR = $(PREFIX)ar E= CSTDFLAG=--std=c89 -pedantic CFLAGS=-g