Merge pull request #8017 from TTornblom/master

IAR: Fix for #7662, only massage the error decode URL for the IAR .xcl
pull/8160/head
Cruz Monrreal 2018-09-17 19:46:12 -05:00 committed by GitHub
commit 3da606e586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -72,7 +72,7 @@
},
"error-decode-http-url-str": {
"help": "HTTP URL string for ARM Mbed-OS Error Decode microsite",
"value": "\"\\nFor more info, visit: https:/\\/armmbed.github.io/mbedos-error/?error=0x%08X\""
"value": "\"\\nFor more info, visit: https://armmbed.github.io/mbedos-error/?error=0x%08X\""
}
},
"target_overrides": {

View File

@ -167,7 +167,7 @@ class IAR(mbedToolchain):
opts = ['-D%s' % d for d in defines]
if for_asm:
config_macros = self.config.get_config_data_macros()
macros_cmd = ['"-D%s"' % d.replace('"', '') for d in config_macros]
macros_cmd = ['"-D%s"' % d.replace('"', '').replace('//','/\/') for d in config_macros]
if self.RESPONSE_FILES:
via_file = self.make_option_file(
macros_cmd, "asm_macros_{}.xcl")