mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Merge pull request #6271 from lfdebrux/profile-merging
Allow build profiles to omit language entriespull/6302/merge
						commit
						d9a1302fd5
					
				| 
						 | 
				
			
			@ -330,7 +330,7 @@ def prepare_toolchain(src_paths, build_dir, target, toolchain_name,
 | 
			
		|||
    profile = {'c': [], 'cxx': [], 'common': [], 'asm': [], 'ld': []}
 | 
			
		||||
    for contents in build_profile or []:
 | 
			
		||||
        for key in profile:
 | 
			
		||||
            profile[key].extend(contents[toolchain_name][key])
 | 
			
		||||
            profile[key].extend(contents[toolchain_name].get(key, []))
 | 
			
		||||
 | 
			
		||||
    toolchain = cur_tc(target, notify, macros, silent, build_dir=build_dir,
 | 
			
		||||
                       extra_verbose=extra_verbose, build_profile=profile)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue