summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-01-24 00:42:41 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-01-24 00:42:41 +0000
commitd8e1d3280fa6b364d42243ab2d77c8ed26478538 (patch)
tree8f84148c0f93f0ae7bebfa6501dbcd700f730bb4
parent86c9c9e63900ce0344cb9a4eb34d4e296de843e4 (diff)
downloadbuildsystem-d8e1d3280fa6b364d42243ab2d77c8ed26478538.tar.gz
buildsystem-d8e1d3280fa6b364d42243ab2d77c8ed26478538.tar.bz2
Pedantic change to flag extension -- we prefer FOO := $(FOO) ... over FOO += ...
svn path=/trunk/tools/buildsystem/; revision=11475
-rw-r--r--makefiles/Makefile.clang10
-rw-r--r--makefiles/Makefile.gcc10
2 files changed, 10 insertions, 10 deletions
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