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

Merge pull request #3414 from bridadan/remove_unnecessary_includes_libs 

Remove unnecessary absolute paths from IAR and ARM compilers
pull/3316/merge
Sam Grove 2016-12-15 10:30:59 -06:00 committed by GitHub
parent 6849fd9c06 105a9b3ea6
commit 92f2c380c7
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/toolchains/arm.py
View File

@ -61,9 +61,9 @@ class ARM(mbedToolchain):
self.flags['common'] += ["--cpu=%s" % cpu]
self.asm = [main_cc] + self.flags['common'] + self.flags['asm'] + ["-I \""+ARM_INC+"\""]
self.cc = [main_cc] + self.flags['common'] + self.flags['c'] + ["-I \""+ARM_INC+"\""]
self.cppc = [main_cc] + self.flags['common'] + self.flags['c'] + self.flags['cxx'] + ["-I \""+ARM_INC+"\""]
self.asm = [main_cc] + self.flags['common'] + self.flags['asm']
self.cc = [main_cc] + self.flags['common'] + self.flags['c']
self.cppc = [main_cc] + self.flags['common'] + self.flags['c'] + self.flags['cxx']
self.ld = [join(ARM_BIN, "armlink")]
self.sys_libs = []
@ -223,22 +223,8 @@ class ARM(mbedToolchain):
class ARM_STD(ARM):
def __init__(self, target, notify=None, macros=None,
silent=False, extra_verbose=False, build_profile=None):
ARM.__init__(self, target, notify, macros, silent,
extra_verbose=extra_verbose, build_profile=build_profile)
# Run-time values
self.ld.extend(["--libpath", join(TOOLCHAIN_PATHS['ARM'], "lib")])
pass
class ARM_MICRO(ARM):
PATCHED_LIBRARY = False
def __init__(self, target, notify=None, macros=None,
silent=False, extra_verbose=False, build_profile=None):
ARM.__init__(self, target, notify, macros, silent,
extra_verbose=extra_verbose, build_profile=build_profile)
# Run-time values
self.ld.extend(["--libpath", join(TOOLCHAIN_PATHS['ARM'], "lib")])

10
tools/toolchains/iar.py
View File

@ -60,14 +60,16 @@ class IAR(mbedToolchain):
# custom c flags
if target.core == "Cortex-M4F":
c_flags_cmd = [
"--cpu", "Cortex-M4F",
"--thumb", "--dlib_config", join(TOOLCHAIN_PATHS['IAR'], "inc", "c", "DLib_Config_Full.h")
"--cpu", "Cortex-M4F"
]
else:
c_flags_cmd = [
"--cpu", cpuchoice,
"--thumb", "--dlib_config", join(TOOLCHAIN_PATHS['IAR'], "inc", "c", "DLib_Config_Full.h")
"--cpu", cpuchoice
]
c_flags_cmd.extend([
"--thumb", "--dlib_config", "DLib_Config_Full.h"
])
# custom c++ cmd flags
cxx_flags_cmd = [
"--c++", "--no_rtti", "--no_exceptions"