diff options
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Makeconfig b/Makeconfig index 831604a050..f9c3b5e7d1 100644 --- a/Makeconfig +++ b/Makeconfig @@ -891,11 +891,15 @@ override CXXFLAGS = $(c++-sysincludes) \ $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) +# This can be changed by a sysdep makefile +no-pie-ccflag = -fno-pie # If everything is compiled with -fPIC (implicitly) we must tell this by -# defining the PIC symbol. +# defining the PIC symbol unless -fno-pie is used to compile archives. ifeq (yes,$(build-pic-default)) +ifneq (-fno-pie,$(no-pie-ccflag)) pic-default = -DPIC endif +endif # Enable object files for different versions of the library. # Various things use $(object-suffixes) to know what all to make. @@ -951,6 +955,15 @@ CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1 libtype.oS = lib%_nonshared.a endif +# When compiler defaults to PIE, we compile archives with -fno-pie and +# we can't link tests against .o files for archives. We need to link +# against .os files for shared libraries. +ifeq (yes,$(build-pie-default)) +test-object-suffix := .os +else +test-object-suffix := .o +endif + # The assembler can generate debug information too. ifndef ASFLAGS ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS)) |