From cf5cb770ae8d0d5fe0af2c860023b84c2aaf3633 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 23 Sep 2012 13:29:54 +0000 Subject: [PATCH] defs.mk: Make GCC other toolchain variables ?= rather than = Signed-off-by: Jan Lindemann --- make/defs.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index b84083bc..d558c33f 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -162,23 +162,23 @@ ifeq ($(TARGET),mingw) CROSS_TOOL_DIR ?= /opt/cross-tools CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- endif -GCC = $(CROSS_TOOL_BIN_PREFIX)gcc -GPP = $(CROSS_TOOL_BIN_PREFIX)g++ -STRIP = $(CROSS_TOOL_BIN_PREFIX)strip -RANLIB = $(CROSS_TOOL_BIN_PREFIX)ranlib -AR = $(CROSS_TOOL_BIN_PREFIX)ar -WINDRES = $(CROSS_TOOL_BIN_PREFIX)windres +GCC ?= $(CROSS_TOOL_BIN_PREFIX)gcc +GPP ?= $(CROSS_TOOL_BIN_PREFIX)g++ +STRIP ?= $(CROSS_TOOL_BIN_PREFIX)strip +RANLIB ?= $(CROSS_TOOL_BIN_PREFIX)ranlib +AR ?= $(CROSS_TOOL_BIN_PREFIX)ar +WINDRES ?= $(CROSS_TOOL_BIN_PREFIX)windres BUILD_LDFLAGS += -lws2_32 -USE_GFILTER = false +USE_GFILTER ?= false MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE LD = $(GPP) else -GCC = gcc -GPP = g++ -STRIP = strip +GCC ?= gcc +GPP ?= g++ +STRIP ?= strip LD = $(GPP) -RANLIB = ranlib -AR = ar +RANLIB ?= ranlib +AR ?= ar endif # makefile helpers