locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable map file creation when building tests

Browse Source 
It causes strange linker warnings on cygwin.
This commit is contained in:
Fred Sundvik 2016-08-27 17:43:35 +03:00
parent 7eefb34e7c
commit 42baa6cf43
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_test.mk
View File

@ -31,6 +31,7 @@ $(GTEST_OUTPUT)_DEFS :=
$(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC) $(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC)
LDFLAGS += -lstdc++ -lpthread -shared-libgcc LDFLAGS += -lstdc++ -lpthread -shared-libgcc
CREATE_MAP := no
VPATH +=\ VPATH +=\
$(LIB_PATH)/googletest\ $(LIB_PATH)/googletest\

6
tmk_core/rules.mk
View File

@ -161,6 +161,7 @@ SCANF_LIB =
MATH_LIB = -lm MATH_LIB = -lm
CREATE_MAP ?= yes
#---------------- Linker Options ---------------- #---------------- Linker Options ----------------
@ -171,7 +172,10 @@ MATH_LIB = -lm
# Comennt out "--relax" option to avoid a error such: # Comennt out "--relax" option to avoid a error such:
# (.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12' # (.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 += -Wl,--relax
LDFLAGS += $(EXTMEMOPTS) LDFLAGS += $(EXTMEMOPTS)
LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS)) LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))