summaryrefslogtreecommitdiffstats
path: root/BaseTools/Conf
diff options
context:
space:
mode:
authorYonghong Zhu <yonghong.zhu@intel.com>2018-08-09 09:25:09 +0800
committerYonghong Zhu <yonghong.zhu@intel.com>2018-08-16 14:17:29 +0800
commit9ddd4f7f9455d9d07e749a2df65a294a1946cd2c (patch)
tree7976a2c6ee3ac91320ccd5a9d248ee621b2acdb9 /BaseTools/Conf
parentf64fbdde8c99bcf0c97f1348f02fdcd8685f1df2 (diff)
downloadedk2-9ddd4f7f9455d9d07e749a2df65a294a1946cd2c.tar.gz
edk2-9ddd4f7f9455d9d07e749a2df65a294a1946cd2c.tar.bz2
edk2-9ddd4f7f9455d9d07e749a2df65a294a1946cd2c.zip
BaseTools: Update the rule to remove .lib before link it for GCC
We met a case on GCC toolchain for increment build. the case is user build Helloworld first, then rename the source file Helloworld.c to Helloworld_new.c and also update the file name to Helloworld_new.c in .inf file's [sources] section. finally, he rebuild it again. It cause build failure due to multiple definition of `UefiMain' because in the .lib file it both have Helloworld.obj and Helloworld_new.obj. current we use the option 'cr' to create the .lib file while the 'r' cmd means replace existing or insert new files into the archive. so in this patch before we create the .lib file, we delete it first. Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Conf')
-rwxr-xr-xBaseTools/Conf/build_rule.template3
1 files changed, 2 insertions, 1 deletions
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index b2667c2bb7..ed54a55842 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
# Portions copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -269,6 +269,7 @@
"$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST)
<Command.GCC, Command.GCCLD>
+ $(RM) ${dst}
"$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)
<Command.RVCT>