]> xenbits.xensource.com Git - ovmf.git/commitdiff
BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template
authorRebecca Cran <rebecca@bsdio.com>
Wed, 10 May 2023 12:17:52 +0000 (06:17 -0600)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Thu, 11 May 2023 00:37:05 +0000 (00:37 +0000)
This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00.

While GCC uses objcopy for the OBJCOPY command, it's not needed for the
CLANGDWARF toolchain and can be left as echo.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Ard BIesheuvel <ardb@kernel.org>
BaseTools/Conf/tools_def.template

index b3c822f0bc20046d4b5009d0833a8d729844b9bc..042b1e142b1b71a688e22b57beaf1a9e612299ca 100755 (executable)
@@ -1864,7 +1864,6 @@ DEFINE CLANGDWARF_ALL_CC_FLAGS         = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGDWARF_
 ###########################\r
 # CLANGDWARF IA32 definitions\r
 ###########################\r
-*_CLANGDWARF_IA32_OBJCOPY_PATH         = DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy\r
 *_CLANGDWARF_IA32_CC_PATH              = DEF(CLANGDWARF_IA32_PREFIX)clang\r
 *_CLANGDWARF_IA32_SLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)llvm-ar\r
 *_CLANGDWARF_IA32_DLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)clang\r
@@ -1901,7 +1900,6 @@ NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS     = DEF(CLANGDWARF_IA32_DLINK2_FLAGS) -O0 -
 ##########################\r
 # CLANGDWARF X64 definitions\r
 ##########################\r
-*_CLANGDWARF_X64_OBJCOPY_PATH         = DEF(CLANGDWARF_X64_PREFIX)llvm-objcopy\r
 *_CLANGDWARF_X64_CC_PATH              = DEF(CLANGDWARF_X64_PREFIX)clang\r
 *_CLANGDWARF_X64_SLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)llvm-ar\r
 *_CLANGDWARF_X64_DLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)clang\r
@@ -1949,7 +1947,6 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
 *_CLANGDWARF_ARM_ASL_OUTFLAGS       = DEF(IASL_OUTFLAGS)\r
 *_CLANGDWARF_ARM_DTCPP_FLAGS        = DEF(GCC_DTCPP_FLAGS)\r
 \r
-*_CLANGDWARF_ARM_OBJCOPY_PATH       = ENV(CLANGDWARF_BIN)llvm-objcopy\r
 *_CLANGDWARF_ARM_CC_PATH            = ENV(CLANGDWARF_BIN)clang\r
 *_CLANGDWARF_ARM_ASM_PATH           = ENV(CLANGDWARF_BIN)clang\r
 *_CLANGDWARF_ARM_PP_PATH            = ENV(CLANGDWARF_BIN)clang\r
@@ -1994,7 +1991,6 @@ DEFINE CLANGDWARF_AARCH64_DLINK_FLAGS  = DEF(CLANGDWARF_AARCH64_TARGET) DEF(GCC_
 *_CLANGDWARF_AARCH64_ASL_OUTFLAGS   = DEF(IASL_OUTFLAGS)\r
 *_CLANGDWARF_AARCH64_DTCPP_FLAGS    = DEF(GCC_DTCPP_FLAGS)\r
 \r
-*_CLANGDWARF_AARCH64_OBJCOPY_PATH   = ENV(CLANGDWARF_BIN)llvm-objcopy\r
 *_CLANGDWARF_AARCH64_CC_PATH        = ENV(CLANGDWARF_BIN)clang\r
 *_CLANGDWARF_AARCH64_ASM_PATH       = ENV(CLANGDWARF_BIN)clang\r
 *_CLANGDWARF_AARCH64_PP_PATH        = ENV(CLANGDWARF_BIN)clang\r