ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed compile with IAR 

Added get_dep_opt for ARM class
pull/395/head
Mihail Stoyanov 2014-07-11 11:13:22 +03:00
parent b92e928f6a
commit 0d85f673ed
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
workspace_tools/toolchains/__init__.py
View File

@ -528,7 +528,7 @@ class mbedToolchain:
self.compiled += 1 self.compiled += 1
self.progress("compile", result['source'], build_update=True) self.progress("compile", result['source'], build_update=True)
self.debug(result['command']) self.debug("Command: %s" % ' '.join(result['command']))
self._compile_output([ self._compile_output([
result['code'], result['code'],
result['output'], result['output'],
@ -581,11 +581,9 @@ class mbedToolchain:
deps = self.parse_dependencies(dep_path) deps = self.parse_dependencies(dep_path)
if len(deps) == 0 or self.need_update(object, deps): if len(deps) == 0 or self.need_update(object, deps):
# Compile
command = cc + ['-D%s' % s for s in self.get_symbols()] + ["-I%s" % i for i in includes] + ["-o", object, source] command = cc + ['-D%s' % s for s in self.get_symbols()] + ["-I%s" % i for i in includes] + ["-o", object, source]
if hasattr(self, "get_dep_opt"): if asm_mode is False and hasattr(self, "get_dep_opt"):
command.extend(self.get_dep_opt(dep_path)) command.extend(self.get_dep_opt(dep_path))
if hasattr(self, "cc_extra"): if hasattr(self, "cc_extra"):
@ -602,6 +600,8 @@ class mbedToolchain:
# Parse output for Warnings and Errors # Parse output for Warnings and Errors
self.parse_output(stderr) self.parse_output(stderr)
self.debug("Return: %s" % rc)
self.debug("Output: %s" % stderr)
# Check return code # Check return code
if rc != 0: if rc != 0:
@ -614,6 +614,7 @@ class mbedToolchain:
command = self._compile_command(source, object, includes) command = self._compile_command(source, object, includes)
if command is None: return True if command is None: return True
self.debug("Command: %s" % ' '.join(command))
_, stderr, rc = run_cmd(command, dirname(object)) _, stderr, rc = run_cmd(command, dirname(object))
self._compile_output([rc, stderr, command]) self._compile_output([rc, stderr, command])
@ -654,7 +655,7 @@ class mbedToolchain:
self.binary(r, elf, bin) self.binary(r, elf, bin)
if self.target.name.startswith('LPC'): if self.target.name.startswith('LPC'):
self.debug("LPC Patch %s" % filename) self.debug("LPC Patch: %s" % filename)
patch(bin) patch(bin)
self.var("compile_succeded", True) self.var("compile_succeded", True)
@ -666,9 +667,11 @@ class mbedToolchain:
return bin return bin
def default_cmd(self, command): def default_cmd(self, command):
self.debug(command) self.debug("Command: %s" % ' '.join(command))
stdout, stderr, rc = run_cmd(command) stdout, stderr, rc = run_cmd(command)
self.debug(stdout) self.debug("Return: %s" % rc)
self.debug("Output: %s" % ' '.join(stdout))
if rc != 0: if rc != 0:
for line in stderr.splitlines(): for line in stderr.splitlines():
self.tool_error(line) self.tool_error(line)
@ -682,6 +685,7 @@ class mbedToolchain:
if self.VERBOSE: if self.VERBOSE:
if type(message) is ListType: if type(message) is ListType:
message = ' '.join(message) message = ' '.join(message)
message = "[DEBUG] " + message
self.notify({'type': 'debug', 'message': message}) self.notify({'type': 'debug', 'message': message})
def cc_info(self, severity, file, line, message, target_name=None, toolchain_name=None): def cc_info(self, severity, file, line, message, target_name=None, toolchain_name=None):

3
workspace_tools/toolchains/arm.py
View File

@ -115,6 +115,9 @@ class ARM(mbedToolchain):
match.group('message') match.group('message')
) )
def get_dep_opt(self, dep_path):
return ["--depend", dep_path]
def archive(self, objects, lib_path): def archive(self, objects, lib_path):
self.default_cmd([self.ar, '-r', lib_path] + objects) self.default_cmd([self.ar, '-r', lib_path] + objects)