From 5b66935b6ec54d16b3536cf13d8fca53358d8777 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Sun, 5 Aug 2012 12:59:36 -0400
Subject: Makefile: move flag settings after build-rules and -templates.
We'll need to mess with the linker flags to add support for ARM
toolchains other than CodeSourcery's. Since the toolchain is
determined in build-rules.mk, decisions that depend on it have to
happen after it's included.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
---
Makefile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index a212ede..3c36bec 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,13 @@ MEMORY_TARGET ?= flash
# $(BOARD)- and $(MEMORY_TARGET)-specific configuration
include $(MAKEDIR)/target-config.mk
+##
+## Build rules and useful templates
+##
+
+include $(MAKEDIR)/build-rules.mk
+include $(MAKEDIR)/build-templates.mk
+
##
## Compilation flags
##
@@ -56,13 +63,6 @@ LDFLAGS = $(TARGET_LDFLAGS) -mcpu=cortex-m3 -mthumb \
-Xassembler --march=armv7-m -Wall
# -Xlinker --print-gc-sections \
-##
-## Build rules and useful templates
-##
-
-include $(MAKEDIR)/build-rules.mk
-include $(MAKEDIR)/build-templates.mk
-
##
## Set all submodules here
##
--
cgit v1.2.3