From d8e1d3280fa6b364d42243ab2d77c8ed26478538 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Mon, 24 Jan 2011 00:42:41 +0000 Subject: Pedantic change to flag extension -- we prefer FOO := $(FOO) ... over FOO += ... svn path=/trunk/tools/buildsystem/; revision=11475 --- makefiles/Makefile.clang | 10 +++++----- makefiles/Makefile.gcc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'makefiles') diff --git a/makefiles/Makefile.clang b/makefiles/Makefile.clang index 591a325..8a1127e 100644 --- a/makefiles/Makefile.clang +++ b/makefiles/Makefile.clang @@ -33,10 +33,10 @@ ifeq ($(TARGET),Darwin) ifneq ($(UNIVERSAL),) UNIVERSAL_FLAGS := $(foreach arch,$(UNIVERSAL),-arch $(arch) ) - CFLAGS += $(UNIVERSAL_FLAGS) - LDFLAGS += $(UNIVERSAL_FLAGS) - CXXFLAGS += $(UNIVERSAL_FLAGS) - ARFLAGS += -s + CFLAGS := $(CFLAGS) $(UNIVERSAL_FLAGS) + LDFLAGS := $(LDFLAGS) $(UNIVERSAL_FLAGS) + CXXFLAGS := $(CXXFLAGS) $(UNIVERSAL_FLAGS) + ARFLAGS := $(ARFLAGS) -s endif endif @@ -44,4 +44,4 @@ endif # Other settings ############################################################################### -CC_CAN_BUILD_AND_DEP ?= yes \ No newline at end of file +CC_CAN_BUILD_AND_DEP ?= yes diff --git a/makefiles/Makefile.gcc b/makefiles/Makefile.gcc index 7d11b24..31b528e 100644 --- a/makefiles/Makefile.gcc +++ b/makefiles/Makefile.gcc @@ -64,13 +64,13 @@ endif ifeq ($(TARGET),Darwin) ifneq ($(UNIVERSAL),) UNIVERSAL_FLAGS := $(foreach arch,$(UNIVERSAL),-arch $(arch) ) - CC_CAN_BUILD_AND_DEP := no + CC_CAN_BUILD_AND_DEP := no CC_CANNOT_DEP := yes - CFLAGS += $(UNIVERSAL_FLAGS) - LDFLAGS += $(UNIVERSAL_FLAGS) - CXXFLAGS += $(UNIVERSAL_FLAGS) - ARFLAGS += -s + CFLAGS := $(CFLAGS) $(UNIVERSAL_FLAGS) + LDFLAGS := $(LDFLAGS) $(UNIVERSAL_FLAGS) + CXXFLAGS := $(CXXFLAGS) $(UNIVERSAL_FLAGS) + ARFLAGS := $(ARFLAGS) -s endif endif -- cgit v1.2.3