Skip to content

Commit 5532fb8

Browse files
committed
Export command line for including mbed_conf.h from toolchains
1 parent 4f29483 commit 5532fb8

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

tools/toolchains/arm.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,14 @@ def get_dep_option(self, object):
114114
dep_path = base + '.d'
115115
return ["--depend", dep_path]
116116

117+
def get_config_option(self, config_header) :
118+
return ['--preinclude', config_header]
119+
117120
def get_compile_options(self, defines, includes):
118121
opts = ['-D%s' % d for d in defines] + ['--via', self.get_inc_file(includes)]
119122
config_header = self.get_config_header()
120123
if config_header is not None:
121-
opts = opts + ['--preinclude', config_header]
124+
opts = opts + self.get_config_option(config_header)
122125
return opts
123126

124127
@hook_tool

tools/toolchains/gcc.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,14 @@ def get_dep_option(self, object):
165165
dep_path = base + '.d'
166166
return ["-MD", "-MF", dep_path]
167167

168+
def get_config_option(self, config_header):
169+
return ['-include', config_header]
170+
168171
def get_compile_options(self, defines, includes):
169172
opts = ['-D%s' % d for d in defines] + ['@%s' % self.get_inc_file(includes)]
170173
config_header = self.get_config_header()
171174
if config_header is not None:
172-
opts = opts + ['-include', config_header]
175+
opts = opts + self.get_conifg_option(config_header)
173176
return opts
174177

175178
@hook_tool

tools/toolchains/iar.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,20 @@ def cc_extra(self, object):
126126
base, _ = splitext(object)
127127
return ["-l", base + '.s.txt']
128128

129+
def get_config_option(self, config_header):
130+
return ['--preinclude', config_header]
131+
129132
def get_compile_options(self, defines, includes, for_asm=False):
130-
opts = ['-D%s' % d for d in defines] + ['-f', self.get_inc_file(includes)]
133+
opts = ['-f', self.get_inc_file(includes)]
134+
config_header = self.get_config_header()
131135
if for_asm:
132136
# The assembler doesn't support '--preinclude', so we need to add
133137
# the macros directly
134138
opts = opts + ['-D%s' % d for d in self.get_config_macros()]
135139
else:
136140
config_header = self.get_config_header()
137141
if config_header is not None:
138-
opts = opts + ['--preinclude', config_header]
142+
opts = opts + self.get_config_option(config_header)
139143
return opts
140144

141145
@hook_tool

0 commit comments

Comments
 (0)