aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2012-08-05 12:59:36 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2012-08-05 12:59:36 -0400
commit5b66935b6ec54d16b3536cf13d8fca53358d8777 (patch)
treec84506dd8cc145e6fff8eb942ec553f63f83fd56
parentaf375c9edee611ea0e12c9ef15ce00a467ca41d9 (diff)
downloadlibrambutan-5b66935b6ec54d16b3536cf13d8fca53358d8777.tar.gz
librambutan-5b66935b6ec54d16b3536cf13d8fca53358d8777.zip
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>
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index a212ede..3c36bec 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,13 @@ MEMORY_TARGET ?= flash
include $(MAKEDIR)/target-config.mk
##
+## Build rules and useful templates
+##
+
+include $(MAKEDIR)/build-rules.mk
+include $(MAKEDIR)/build-templates.mk
+
+##
## Compilation flags
##
@@ -57,13 +64,6 @@ LDFLAGS = $(TARGET_LDFLAGS) -mcpu=cortex-m3 -mthumb \
# -Xlinker --print-gc-sections \
##
-## Build rules and useful templates
-##
-
-include $(MAKEDIR)/build-rules.mk
-include $(MAKEDIR)/build-templates.mk
-
-##
## Set all submodules here
##