]> xenbits.xensource.com Git - ovmf.git/commitdiff
BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX
authorArd Biesheuvel <ardb@kernel.org>
Thu, 11 May 2023 06:55:20 +0000 (08:55 +0200)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Fri, 12 May 2023 13:12:35 +0000 (13:12 +0000)
When using CLANGDWARF to build for the ARM architecture, objcopy is
references via the wrong environment variable, resulting in the wrong
llvm-objcopy to be used (if one exists), or the build to fail (if
CLANGDWARF_BIN points to the only available instance)

So use CLANGDWARF_BIN instead, which was what was intended.

Fixes: ecbc394365f50f3c ("BaseTools: Set CLANGDWARF RC path ...")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
BaseTools/Conf/tools_def.template

index 042b1e142b1b71a688e22b57beaf1a9e612299ca..76eb724c5d443de2c08a08a42d5c8db6d14feb4b 100755 (executable)
@@ -1957,7 +1957,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS   = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI
 *_CLANGDWARF_ARM_ASLDLINK_PATH      = ENV(CLANGDWARF_BIN)clang\r
 \r
 *_CLANGDWARF_ARM_SLINK_PATH         = ENV(CLANGDWARF_BIN)llvm-ar\r
-*_CLANGDWARF_ARM_RC_PATH            = ENV(CLANGDWARF_ARM_PREFIX)llvm-objcopy\r
+*_CLANGDWARF_ARM_RC_PATH            = ENV(CLANGDWARF_BIN)llvm-objcopy\r
 \r
 *_CLANGDWARF_ARM_ASLCC_FLAGS        = DEF(GCC_ASLCC_FLAGS) -fno-lto\r
 *_CLANGDWARF_ARM_ASLDLINK_FLAGS     = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_ASLDLINK_FLAGS)\r