@@ -721,8 +721,7 @@ def BuildLibInstallAction(target, source, env):
|
||||
do_copy_file(lib_name, dst_name)
|
||||
break
|
||||
|
||||
def DoBuilding(target, objects):
|
||||
|
||||
def DoBuilding(target, objects, build_lib = False):
|
||||
# merge all objects into one list
|
||||
def one_list(l):
|
||||
lst = []
|
||||
@@ -792,10 +791,18 @@ def DoBuilding(target, objects):
|
||||
objects = sorted(objects)
|
||||
objects.append(objects_in_group)
|
||||
|
||||
program = Env.Program(target, objects)
|
||||
if build_lib:
|
||||
program = Env.Library(target, objects)
|
||||
# add library copy action
|
||||
Env.BuildLib(target, program)
|
||||
else:
|
||||
program = Env.Program(target, objects)
|
||||
|
||||
EndBuilding(target, program)
|
||||
|
||||
def DoBuildingLib(lib, objects):
|
||||
DoBuilding(lib, objects, build_lib=True)
|
||||
|
||||
def GenTargetProject(program = None):
|
||||
|
||||
if GetOption('target') in ['mdk', 'mdk4', 'mdk5']:
|
||||
|
@@ -436,6 +436,11 @@ def ARMCC_Version():
|
||||
child = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
stdout, stderr = child.communicate()
|
||||
|
||||
try:
|
||||
stdout = stdout.decode()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
'''
|
||||
example stdout:
|
||||
Product: MDK Plus 5.24
|
||||
|
Reference in New Issue
Block a user