From c841db953822200b5f9babeb7ddeaefe0bb377df Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Mon, 7 Aug 2023 13:07:24 +0200 Subject: [PATCH] configure: Allow host fragments to react to --enable-host-shared. This makes the host_shared value available to host makefile fragments. It uses this to adjust Darwin's mdynamic-no-pic in the case that shared host resources are required. Signed-off-by: Iain Sandoe config/ * mh-darwin: Require a non-shared host configuration to enable mdynamic-no-pic where that is supported. --- config/mh-darwin | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/mh-darwin b/config/mh-darwin index fb2bb5ad1d9..b72835ae953 100644 --- a/config/mh-darwin +++ b/config/mh-darwin @@ -11,9 +11,15 @@ # non-bootstrapped compiler), later stages will be built by GCC which supports # the required flags. +# We cannot use mdynamic-no-pic when building shared host resources. + +ifeq (${host_shared},no) BOOTSTRAP_TOOL_CAN_USE_MDYNAMIC_NO_PIC := $(shell \ $(CC) -S -xc /dev/null -o /dev/null -Werror -mno-dynamic-no-pic 2>/dev/null \ && echo true) +else +BOOTSTRAP_TOOL_CAN_USE_MDYNAMIC_NO_PIC := false +endif @if gcc-bootstrap ifeq (${BOOTSTRAP_TOOL_CAN_USE_MDYNAMIC_NO_PIC},true) @@ -21,8 +27,10 @@ STAGE1_CFLAGS += -mdynamic-no-pic else STAGE1_CFLAGS += -fPIC endif +ifeq (${host_shared},no) # Add -mdynamic-no-pic to later stages when we know it is built with GCC. BOOT_CFLAGS += -mdynamic-no-pic +endif @endif gcc-bootstrap @unless gcc-bootstrap -- 2.30.2