Skip to content

Commit 209cf9f

Browse files
committed
Add config file inculde directory when present
1 parent fed50f8 commit 209cf9f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

tools/export/exporters.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ def scan_and_copy_resources(self, prj_paths, trg_path, relative=False):
197197
self.config_header = self.toolchain.MBED_CONFIG_FILE_NAME
198198
config.get_config_data_header(join(trg_path, self.config_header))
199199
self.config_macros = []
200+
self.resources.inc_dirs.append(".")
200201
else:
201202
# And add the configuration macros to the toolchain
202203
self.config_macros = config.get_config_data_macros()

tools/export/gcc_arm_common.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ all: $(PROJECT).bin $(PROJECT).hex size
8989

9090
.asm.o:
9191
+@$(call MAKEDIR,$(dir $@))
92-
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
92+
$(CC) $(CPU) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
9393
.s.o:
9494
+@$(call MAKEDIR,$(dir $@))
95-
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
95+
$(CC) $(CPU) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
9696
.S.o:
9797
+@$(call MAKEDIR,$(dir $@))
98-
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
98+
$(CC) $(CPU) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
9999

100100
.c.o:
101101
+@$(call MAKEDIR,$(dir $@))

0 commit comments

Comments
 (0)