[edk2-devel] [PATCH] BaseTools/tools_def: Drop ref to undefined CLANGDWARF_ARM_PREFIX

[Rebecca Cran]

Reviewed-by: Rebecca Cran <rebecca at bsdio.com>


Thanks!


On 5/11/23 12:59 AM, Ard Biesheuvel wrote:
> 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.
>
> Cc: Rebecca Cran <rebecca at bsdio.com>
> Cc: Liming Gao <gaoliming at byosoft.com.cn>
> Fixes: ecbc394365f50f3c ("BaseTools: Set CLANGDWARF RC path ...")
> Signed-off-by: Ard Biesheuvel <ardb at kernel.org>
> ---
>   BaseTools/Conf/tools_def.template | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
> index 4ae21b85a8571f93..503a6687c1f03f56 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -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
>
>   
>
>   *_CLANGDWARF_ARM_SLINK_PATH         = ENV(CLANGDWARF_BIN)llvm-ar
>
> -*_CLANGDWARF_ARM_RC_PATH            = ENV(CLANGDWARF_ARM_PREFIX)llvm-objcopy
>
> +*_CLANGDWARF_ARM_RC_PATH            = ENV(CLANGDWARF_BIN)llvm-objcopy
>
>   
>
>   *_CLANGDWARF_ARM_ASLCC_FLAGS        = DEF(GCC_ASLCC_FLAGS) -fno-lto
>
>   *_CLANGDWARF_ARM_ASLDLINK_FLAGS     = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_ASLDLINK_FLAGS)
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104730): https://edk2.groups.io/g/devel/message/104730
Mute This Topic: https://groups.io/mt/98822561/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-