From 4a48a38fa99f067b8f3a3d1a5dc7a1e602db351f Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 21 Jun 2023 18:19:36 +0200 Subject: [PATCH] ada: Fix build of GNAT tools gcc/ada/ * gcc-interface/Makefile.in (LIBIBERTY): Fix condition. (TOOLS_LIBS): Add @LD_PICFLAG@. --- gcc/ada/gcc-interface/Makefile.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index dc0e54f8eb63..b5243a24a8ff 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -240,10 +240,10 @@ ALL_CPPFLAGS = $(CPPFLAGS) ALL_COMPILERFLAGS = $(ALL_CFLAGS) # This is where we get libiberty.a from. -ifeq ($(PICFLAG),) -LIBIBERTY = ../../libiberty/libiberty.a -else +ifneq ($(findstring $(PICFLAG),-fPIC -fPIE),) LIBIBERTY = ../../libiberty/pic/libiberty.a +else +LIBIBERTY = ../../libiberty/libiberty.a endif # We need to link against libbacktrace because diagnostic.c in @@ -261,6 +261,9 @@ TOOLS_LIBS = ../version.o ../link.o ../targext.o ../../ggc-none.o \ $(LIBGNAT) $(LIBINTL) $(LIBICONV) ../$(LIBBACKTRACE) ../$(LIBIBERTY) \ $(SYSLIBS) $(TGT_LIB) +# Add -no-pie to TOOLS_LIBS since some of them are compiled with -fno-PIE. +TOOLS_LIBS += @LD_PICFLAG@ + # Specify the directories to be searched for header files. # Both . and srcdir are used, in that order, # so that tm.h and config.h will be found in the compilation -- 2.47.2