Skip to content

Commit 60648fc

Browse files
donghengdongheng
dongheng
authored and
dongheng
committedSep 20, 2019
fix(build): in GNU make, use "cygpath -m" to avoid backslashes
1 parent 653d20d commit 60648fc

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed
 

‎make/ldgen.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LDGEN_LIBRARIES=$(foreach libcomp,$(COMPONENT_LIBRARIES),$(BUILD_DIR_BASE)/$(lib
77
ifeq ($(OS),Windows_NT)
88
define ldgen_process_template
99
$(BUILD_DIR_BASE)/ldgen_libraries: $(LDGEN_LIBRARIES) $(IDF_PATH)/make/ldgen.mk
10-
printf "$(foreach info,$(LDGEN_LIBRARIES),$(subst \,/,$(shell cygpath -w $(info)))\n)" > $(BUILD_DIR_BASE)/ldgen_libraries
10+
printf "$(foreach info,$(LDGEN_LIBRARIES),$(subst \,/,$(shell cygpath -m $(info)))\n)" > $(BUILD_DIR_BASE)/ldgen_libraries
1111

1212
$(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen_libraries
1313
@echo 'Generating $(notdir $(2))'
@@ -18,8 +18,8 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen_librarie
1818
--libraries-file $(BUILD_DIR_BASE)/ldgen_libraries \
1919
--output $(2) \
2020
--kconfig $(IDF_PATH)/Kconfig \
21-
--env "COMPONENT_KCONFIGS=$(foreach k, $(COMPONENT_KCONFIGS), $(shell cygpath -w $(k)))" \
22-
--env "COMPONENT_KCONFIGS_PROJBUILD=$(foreach k, $(COMPONENT_KCONFIGS_PROJBUILD), $(shell cygpath -w $(k)))" \
21+
--env "COMPONENT_KCONFIGS=$(foreach k, $(COMPONENT_KCONFIGS), $(shell cygpath -m $(k)))" \
22+
--env "COMPONENT_KCONFIGS_PROJBUILD=$(foreach k, $(COMPONENT_KCONFIGS_PROJBUILD), $(shell cygpath -m $(k)))" \
2323
--env "IDF_CMAKE=n" \
2424
--objdump $(OBJDUMP)
2525
endef

‎make/project_config.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ COMPONENT_KCONFIGS_PROJBUILD := $(foreach component,$(COMPONENT_PATHS),$(wildcar
66

77
ifeq ($(OS),Windows_NT)
88
# kconfiglib requires Windows-style paths for kconfig files
9-
COMPONENT_KCONFIGS := $(shell cygpath -w $(COMPONENT_KCONFIGS))
10-
COMPONENT_KCONFIGS_PROJBUILD := $(shell cygpath -w $(COMPONENT_KCONFIGS_PROJBUILD))
9+
COMPONENT_KCONFIGS := $(shell cygpath -m $(COMPONENT_KCONFIGS))
10+
COMPONENT_KCONFIGS_PROJBUILD := $(shell cygpath -m $(COMPONENT_KCONFIGS_PROJBUILD))
1111
endif
1212

1313
#For doing make menuconfig etc

0 commit comments

Comments
 (0)
Please sign in to comment.