Incorporate change in assignment logic suggested by dhylands

This commit is contained in:
blmorris 2014-09-22 23:00:42 -04:00
parent 1fae787493
commit 8afb9b3863

View File

@ -29,13 +29,16 @@ else
COPT = -Os #-DNDEBUG COPT = -Os #-DNDEBUG
endif 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) ifeq ($(UNAME_S),Darwin)
# Force OSX to use clang even if gcc is present, value set in mkenv.mk # 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 # must be ovewritten here to avoid breaking stmhal build on OSX
CC = clang CC = clang
# Use clang syntax for LDFLAGS # 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 endif
ifeq ($(MICROPY_FORCE_32BIT),1) ifeq ($(MICROPY_FORCE_32BIT),1)