Skip to content

Commit

Permalink
Disable map file creation when building tests
Browse files Browse the repository at this point in the history
It causes strange linker warnings on cygwin.
  • Loading branch information
fredizzimo committed Aug 27, 2016
1 parent 7eefb34 commit 42baa6c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions build_test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ $(GTEST_OUTPUT)_DEFS :=
$(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC)

LDFLAGS += -lstdc++ -lpthread -shared-libgcc
CREATE_MAP := no

VPATH +=\
$(LIB_PATH)/googletest\
Expand Down
6 changes: 5 additions & 1 deletion tmk_core/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ SCANF_LIB =


MATH_LIB = -lm
CREATE_MAP ?= yes


#---------------- Linker Options ----------------
Expand All @@ -171,7 +172,10 @@ MATH_LIB = -lm
# Comennt out "--relax" option to avoid a error such:
# (.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12'
#
LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref

ifeq ($(CREATE_MAP),yes)
LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
endif
#LDFLAGS += -Wl,--relax
LDFLAGS += $(EXTMEMOPTS)
LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
Expand Down

0 comments on commit 42baa6c

Please sign in to comment.