temp hack. Will rewrite the build script later.

This commit is contained in:
Yangqing Jia 2015-12-02 10:06:15 -08:00
parent 3a4d4285f2
commit acc16645d3

View file

@ -483,13 +483,12 @@ class cc_target(BuildTarget):
' '.join([Env.LINK_STATIC, archive_file] + obj_files)]
if self.build_binary:
link_binary_commands = [
' '.join([Env.LINK_BINARY, self.OutputName()] + self.cc_obj_files +
[Env.LINKFLAGS])]
' '.join([Env.LINK_BINARY, self.OutputName(), Env.LINKFLAGS] + self.cc_obj_files)]
self.command_groups = [cpp_commands, link_commands, link_binary_commands]
elif self.shared:
link_shared_commands = [' '.join(
[Env.LINK_SHARED, self.OutputName(is_library=True, is_shared=True)]
+ obj_files + self.cc_obj_files[1:] + [Env.LINKFLAGS])]
[Env.LINK_SHARED, self.OutputName(is_library=True, is_shared=True), Env.LINKFLAGS]
+ obj_files + self.cc_obj_files[1:])]
self.command_groups = [cpp_commands, link_commands, link_shared_commands]
else:
self.command_groups = [cpp_commands, link_commands]