From fe5ddaee8e5bb64a5d8d228374d022388220782d Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 18 Jun 2024 15:56:45 -0400 Subject: [PATCH] fix(webapp/Makefile): Drop quotes around appended cppflags (#27374) Currently, if you're building under aarch64 and have cppflags set in your environment as such: `CPPFLAGS="-O2 -Wall -fomit-frame-pointer -march=armv8-a -mtune=neoverse-n1 -Wp,-D_FORTIFY_SOURCE=3"` This will result in `-DPNG_ARM_NEON_OPT=0` being improperly applied: `CPPFLAGS="-O2 -Wall -fomit-frame-pointer -march=armv8-a -mtune=neoverse-n1 -Wp,-D_FORTIFY_SOURCE=3 " -DPNG_ARM_NEON_OPT=0""` As a result, when npm install is ran, it will fail. To fix this, we remove the quotes around the appended cppflags Signed-off-by: RJ Sampson --- webapp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/Makefile b/webapp/Makefile index da56ad1c1f..a01f59d060 100644 --- a/webapp/Makefile +++ b/webapp/Makefile @@ -8,12 +8,12 @@ CI ?= false # please see optipng-bin Linux arm64 support issue (https://github.com/imagemin/optipng-bin/issues/118) for details: ifeq ($(shell uname)/$(shell uname -m),Linux/aarch64) LINUX_ARM64 = true - CPPFLAGS += " -DPNG_ARM_NEON_OPT=0" + CPPFLAGS += -DPNG_ARM_NEON_OPT=0 endif # Exact same issue but for Linux/PPC64 ifeq ($(findstring Linux/ppc64,$(shell uname)/$(shell uname -m)),Linux/ppc64) LINUX_PPC64 = true - CPPFLAGS += " -DPNG_POWERPC_VSX_OPT=0" + CPPFLAGS += -DPNG_POWERPC_VSX_OPT=0 endif .PHONY: run