Skip to content

Commit 6867499

Browse files
committed
Test for existance of dir before creating it
1 parent 6971b1e commit 6867499

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

tools/export/gcc_arm_common.tmpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded
33

44
ifeq ($(OS),Windows_NT)
5-
MAKEDIR = mkdir
5+
MAKEDIR = IF exists $(1) () ELSE (mkdir $(1))
66
else
7-
MAKEDIR = mkdir -p
7+
MAKEDIR = [ -d $(1) ] || mkdir -p $(1)
88
endif
99

1010
ifeq (,$(filter bin,$(notdir $(CURDIR))))
@@ -14,7 +14,7 @@ MAKETARGET = $(MAKE) --no-print-directory -C $@ -f $(CURDIR)/Makefile \
1414
SRCDIR=$(CURDIR) $(MAKECMDGOALS)
1515
.PHONY: $(OBJDIR) clean
1616
$(OBJDIR):
17-
+@$(MAKEDIR) $@
17+
+@$(call MAKEDIR, $@)
1818
+@$(MAKETARGET)
1919
Makefile : ;
2020
% :: $(OBJDIR) ; :
@@ -83,21 +83,21 @@ all: $(PROJECT).bin $(PROJECT).hex size
8383

8484

8585
.asm.o:
86-
@$(MAKEDIR) $(dir $@)
86+
+@$(call MAKEDIR, $(dir $@))
8787
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
8888
.s.o:
89-
@$(MAKEDIR) $(dir $@)
89+
+@$(call MAKEDIR, $(dir $@))
9090
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
9191
.S.o:
92-
@$(MAKEDIR) $(dir $@)
92+
+@$(call MAKEDIR, $(dir $@))
9393
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
9494

9595
.c.o:
96-
@$(MAKEDIR) $(dir $@)
96+
+@$(call MAKEDIR, $(dir $@))
9797
$(CC) $(CC_FLAGS) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $<
9898

9999
.cpp.o:
100-
@$(MAKEDIR) $(dir $@)
100+
+@$(call MAKEDIR, $(dir $@))
101101
$(CPP) $(CPPC_FLAGS) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $<
102102

103103

0 commit comments

Comments
 (0)