Re: [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template

["Rebecca Cran" <rebecca@bsdio.com>]

PR: https://github.com/tianocore/edk2/pull/4384


On 5/10/23 06:31, Rebecca Cran wrote:
> 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>
> ---
>   BaseTools/Conf/tools_def.template | 4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
> index b3c822f0bc20..042b1e142b1b 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -1864,7 +1864,6 @@ DEFINE CLANGDWARF_ALL_CC_FLAGS         = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGDWARF_
>   ###########################
>   # CLANGDWARF IA32 definitions
>   ###########################
> -*_CLANGDWARF_IA32_OBJCOPY_PATH         = DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy
>   *_CLANGDWARF_IA32_CC_PATH              = DEF(CLANGDWARF_IA32_PREFIX)clang
>   *_CLANGDWARF_IA32_SLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)llvm-ar
>   *_CLANGDWARF_IA32_DLINK_PATH           = DEF(CLANGDWARF_IA32_PREFIX)clang
> @@ -1901,7 +1900,6 @@ NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS     = DEF(CLANGDWARF_IA32_DLINK2_FLAGS) -O0 -
>   ##########################
>   # CLANGDWARF X64 definitions
>   ##########################
> -*_CLANGDWARF_X64_OBJCOPY_PATH         = DEF(CLANGDWARF_X64_PREFIX)llvm-objcopy
>   *_CLANGDWARF_X64_CC_PATH              = DEF(CLANGDWARF_X64_PREFIX)clang
>   *_CLANGDWARF_X64_SLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)llvm-ar
>   *_CLANGDWARF_X64_DLINK_PATH           = DEF(CLANGDWARF_X64_PREFIX)clang
> @@ -1949,7 +1947,6 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
>   *_CLANGDWARF_ARM_ASL_OUTFLAGS       = DEF(IASL_OUTFLAGS)
>   *_CLANGDWARF_ARM_DTCPP_FLAGS        = DEF(GCC_DTCPP_FLAGS)
>   
> -*_CLANGDWARF_ARM_OBJCOPY_PATH       = ENV(CLANGDWARF_BIN)llvm-objcopy
>   *_CLANGDWARF_ARM_CC_PATH            = ENV(CLANGDWARF_BIN)clang
>   *_CLANGDWARF_ARM_ASM_PATH           = ENV(CLANGDWARF_BIN)clang
>   *_CLANGDWARF_ARM_PP_PATH            = ENV(CLANGDWARF_BIN)clang
> @@ -1994,7 +1991,6 @@ DEFINE CLANGDWARF_AARCH64_DLINK_FLAGS  = DEF(CLANGDWARF_AARCH64_TARGET) DEF(GCC_
>   *_CLANGDWARF_AARCH64_ASL_OUTFLAGS   = DEF(IASL_OUTFLAGS)
>   *_CLANGDWARF_AARCH64_DTCPP_FLAGS    = DEF(GCC_DTCPP_FLAGS)
>   
> -*_CLANGDWARF_AARCH64_OBJCOPY_PATH   = ENV(CLANGDWARF_BIN)llvm-objcopy
>   *_CLANGDWARF_AARCH64_CC_PATH        = ENV(CLANGDWARF_BIN)clang
>   *_CLANGDWARF_AARCH64_ASM_PATH       = ENV(CLANGDWARF_BIN)clang
>   *_CLANGDWARF_AARCH64_PP_PATH        = ENV(CLANGDWARF_BIN)clang