Skip to content

Commit 9b5bafd

Browse files
Merge pull request contiki-os#1861 from pjonsson/remove-cygwin
jn516x: remove cygwin support
2 parents 81b208c + 684bbcf commit 9b5bafd

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

arch/platform/jn516x/Makefile.jn516x

+1-16
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,6 @@ LDFLAGS += -L$(CHIP_BASE_DIR)/Library
168168

169169
LDLIBS := $(addsuffix _$(JENNIC_CHIP_FAMILY),$(APPLIBS)) $(LDLIBS)
170170

171-
ifeq ($(HOST_OS),Windows)
172-
# Windows assumes Cygwin. Substitute all paths in CFLAGS and LDFLAGS with Windows paths.
173-
CFLAGS := $(patsubst -I/cygdrive/c/%,-Ic:/%,$(CFLAGS))
174-
LDFLAGS := $(patsubst -L/cygdrive/c/%,-Lc:/%,$(LDFLAGS))
175-
endif
176-
177171
# These symbols are used by the stack check library
178172
LDFLAGS += -Wl,--defsym=_stack=_stack_low_water_mark
179173
LDFLAGS += -Wl,--defsym=_stack_origin=_ram_top
@@ -222,18 +216,10 @@ DEV_PORT = $(USBDEVBASENAME)$(MOTE)
222216
%.dmp: %.$(TARGET)
223217
$(Q)$(OBJDUMP) -d $< > $@
224218

225-
define FINALIZE_DEPENDENCY_
226-
# hack: subsitute windows path back to cygwin path
227-
sed -e 's/c:\//\/cygdrive\/c\//' $(@:.o=.d) > $(@:.o=.$$$$); \
228-
cp $(@:.o=.$$$$) $(@:.o=.d); \
229-
rm -f $(@:.o=.$$$$)
230-
endef
231-
232219
CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
233220
$(OBJECTDIR)/%.o: %.c | $(OBJECTDIR)
234221
$(TRACE_CC)
235222
$(Q)$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
236-
@$(FINALIZE_DEPENDENCY_)
237223

238224
CUSTOM_RULE_LINK = 1
239225
ALLLIBS = $(addprefix -l,$(LDLIBS)) $(addprefix -l,$(LDSTACKLIBS)) $(addprefix -l,$(LDMYLIBS))
@@ -244,8 +230,7 @@ ifneq ($(wildcard $(SDK_BASE_DIR)/Components/Library/*),)
244230
$(BUILD_DIR_BOARD)/%.$(TARGET): %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB) $(ABS_APPLIBS)
245231
@echo ${filter %.a,$^}
246232
$(Q)$(CC) -Wl,--gc-sections $(LDFLAGS) -T$(LINKCMD) -o $@ -Wl,--start-group \
247-
$(patsubst /cygdrive/c/%,c:/%,${filter-out %.a,$^}) \
248-
$(patsubst /cygdrive/c/%,c:/%,${filter %.a,$^}) \
233+
${filter-out %.a,$^} ${filter %.a,$^} \
249234
$(ALLLIBS) -Wl,--end-group -Wl,-Map,$(CONTIKI_NG_PROJECT_MAP)
250235
else
251236
# The SDK does not include libraries, only build objects and libraries, skip linking

0 commit comments

Comments
 (0)