From 11f62f4cc09f16d265da1a737dabfd8ed65f8c00 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Tue, 9 May 2023 16:31:53 -0600 Subject: BaseTools: Set the CLANGDWARF OBJCOPY path in tools_def.template Set the OBJCOPY path for the CLANGDWARF toolchain to 'llvm-objcopy' to override the default of 'echo'. Signed-off-by: Rebecca Cran Reviewed-by: Michael D Kinney Tested-by: Michael D Kinney --- BaseTools/Conf/tools_def.template | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'BaseTools/Conf/tools_def.template') diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 8ed9cd3da4..96a413c4ca 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1864,6 +1864,7 @@ 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 @@ -1900,6 +1901,7 @@ 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 @@ -1947,6 +1949,7 @@ 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 @@ -1991,6 +1994,7 @@ 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 -- cgit v1.2.3