From ef240bfffa9bd342a276eb73691a6996aa254156 Mon Sep 17 00:00:00 2001 From: X512 Date: Mon, 26 Jul 2021 03:48:19 +0900 Subject: [PATCH] makefile-engine: fix for riscv64 Change-Id: I85c18ce812db65606ef6aba64f81b80872618263 Reviewed-on: https://review.haiku-os.org/c/haiku/+/4317 Tested-by: Commit checker robot Reviewed-by: Adrien Destugues --- data/develop/makefile-engine | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/data/develop/makefile-engine b/data/develop/makefile-engine index 7ca3e7bf7e..4db9cbb91c 100644 --- a/data/develop/makefile-engine +++ b/data/develop/makefile-engine @@ -144,30 +144,21 @@ VPATH := VPATH += $(addprefix :, $(subst ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(SRC_PATHS)))) # Set up the local & system include paths and C++ stdlibs. -ifneq (,$(filter $(CPU),x86 x86_64)) - LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -I, $(path))) - ifeq ($(CC_VER), 2) +LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -I, $(path))) +ifeq ($(CC_VER), 2) INCLUDES = $(LOC_INCLUDES) INCLUDES += -I- INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -I, $(path))) STDCPPLIBS = stdc++.r4 - else +else INCLUDES = -iquote./ INCLUDES += $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -iquote, $(path))) INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -isystem, $(path))) STDCPPLIBS = stdc++ supc++ - endif -else -ifeq ($(CPU), ppc) - LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -I, $(path))) - SYS_INCLUDES += -i- - SYS_INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -i , $(path))) +endif - INCLUDES = $(LOC_INCLUDES) $(SYS_INCLUDES) -endif -endif # Add the -L prefix to all of the library paths. LINK_PATHS = $(foreach path, $(SRC_PATHS) $(LIBPATHS), \