summaryrefslogtreecommitdiffstatshomepage
path: root/unix
diff options
context:
space:
mode:
authorblmorris <bryan.morrissey@gmail.com>2014-09-22 23:00:42 -0400
committerblmorris <bryan.morrissey@gmail.com>2014-09-22 23:00:42 -0400
commit8afb9b3863358c4a903aff67af6ccfc854bb65cb (patch)
treec153ef8654a18ad12e59e8025af2eb724947126f /unix
parent1fae7874931d07c4cfa08fa447b6d9c3805e40af (diff)
downloadmicropython-8afb9b3863358c4a903aff67af6ccfc854bb65cb.tar.gz
micropython-8afb9b3863358c4a903aff67af6ccfc854bb65cb.zip
Incorporate change in assignment logic suggested by dhylands
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/Makefile b/unix/Makefile
index 8bbe5554d5..3e74d7e2e6 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -29,13 +29,16 @@ else
COPT = -Os #-DNDEBUG
endif
-LDFLAGS = $(LDFLAGS_MOD) -lm -Wl,-Map=$@.map,--cref $(LDFLAGS_EXTRA)
+LDFLAGS = $(LDFLAGS_MOD) -lm -Wl$(LDFLAGS_MAP_EXTRA) $(LDFLAGS_EXTRA)
ifeq ($(UNAME_S),Darwin)
# Force OSX to use clang even if gcc is present, value set in mkenv.mk
# must be ovewritten here to avoid breaking stmhal build on OSX
CC = clang
# Use clang syntax for LDFLAGS
-LDFLAGS = $(LDFLAGS_MOD) -lm -Wl,-map,$@.map $(LDFLAGS_EXTRA)
+LDFLAGS_MAP_EXTRA = ,-map,$@.map
+else
+# Use gcc syntax
+LDFLAGS_MAP_EXTRA = ,-Map=$@.map,--cref
endif
ifeq ($(MICROPY_FORCE_32BIT),1)