[PATCH] Makefile: Use make internal string functions

[PATCH] Makefile: Use make internal string functions

[Laurent Vivier]

TARGET_ARCH is computed from '$(CC) -dumpmachine' using external
bash commands like echo, cut, tr and sed. This can be done using
make internal string functions.

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index cb7448079de5..1fce73707805 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,9 @@ DUAL_STACK_SOCKETS := 1
 
 TARGET ?= $(shell $(CC) -dumpmachine)
 # Get 'uname -m'-like architecture description for target
-TARGET_ARCH := $(shell echo $(TARGET) | cut -f1 -d- | tr [A-Z] [a-z])
-TARGET_ARCH := $(shell echo $(TARGET_ARCH) | sed 's/powerpc/ppc/')
+TARGET_ARCH := $(firstword $(subst -, ,$(TARGET)))
+TARGET_ARCH := $(patsubst [:upper:],[:lower:],$(TARGET_ARCH))
+TARGET_ARCH := $(subst powerpc,ppc,$(TARGET_ARCH))
 
 # On some systems enabling optimization also enables source fortification,
 # automagically. Do not override it.
-- 
@@ -17,8 +17,9 @@ DUAL_STACK_SOCKETS := 1
 
 TARGET ?= $(shell $(CC) -dumpmachine)
 # Get 'uname -m'-like architecture description for target
-TARGET_ARCH := $(shell echo $(TARGET) | cut -f1 -d- | tr [A-Z] [a-z])
-TARGET_ARCH := $(shell echo $(TARGET_ARCH) | sed 's/powerpc/ppc/')
+TARGET_ARCH := $(firstword $(subst -, ,$(TARGET)))
+TARGET_ARCH := $(patsubst [:upper:],[:lower:],$(TARGET_ARCH))
+TARGET_ARCH := $(subst powerpc,ppc,$(TARGET_ARCH))
 
 # On some systems enabling optimization also enables source fortification,
 # automagically. Do not override it.
-- 
2.47.0

Re: [PATCH] Makefile: Use make internal string functions

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

On Wed, Nov 27, 2024 at 05:16:45PM +0100, Laurent Vivier wrote:
> TARGET_ARCH is computed from '$(CC) -dumpmachine' using external
> bash commands like echo, cut, tr and sed. This can be done using
> make internal string functions.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  Makefile | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index cb7448079de5..1fce73707805 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -17,8 +17,9 @@ DUAL_STACK_SOCKETS := 1
>  
>  TARGET ?= $(shell $(CC) -dumpmachine)
>  # Get 'uname -m'-like architecture description for target
> -TARGET_ARCH := $(shell echo $(TARGET) | cut -f1 -d- | tr [A-Z] [a-z])
> -TARGET_ARCH := $(shell echo $(TARGET_ARCH) | sed 's/powerpc/ppc/')
> +TARGET_ARCH := $(firstword $(subst -, ,$(TARGET)))
> +TARGET_ARCH := $(patsubst [:upper:],[:lower:],$(TARGET_ARCH))
> +TARGET_ARCH := $(subst powerpc,ppc,$(TARGET_ARCH))
>  
>  # On some systems enabling optimization also enables source fortification,
>  # automagically. Do not override it.

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] Makefile: Use make internal string functions

[Stefano Brivio]

On Wed, 27 Nov 2024 17:16:45 +0100
Laurent Vivier <lvivier@redhat.com> wrote:

> TARGET_ARCH is computed from '$(CC) -dumpmachine' using external
> bash commands like echo, cut, tr and sed. This can be done using
> make internal string functions.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Applied.

-- 
Stefano