From 3618e5fecefde1ff4f383fdd349e64deb472df4e Mon Sep 17 00:00:00 2001 From: "Paul E. Murphy" Date: Fri, 7 Feb 2020 14:08:01 -0600 Subject: Makeconfig: sandwich gnulib-tests between libc/ld linking of tests This better resembles the default linking process with the gnulibs, and also resolves the increasingly difficult to maintain f128-loader-link usage on powerpc64le as some libgcc symbols are dependent on those found in the loader (ld). --- Makeconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makeconfig') diff --git a/Makeconfig b/Makeconfig index f252842979..ac567caddc 100644 --- a/Makeconfig +++ b/Makeconfig @@ -564,13 +564,13 @@ else link-libc-tests-rpath-link = $(link-libc-rpath-link) endif # build-hardcoded-path-in-tests -link-libc-before-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ - $(common-objpfx)$(patsubst %,$(libtype.oS),c) \ - -Wl,--as-needed $(elf-objpfx)ld.so \ - -Wl,--no-as-needed -link-libc = $(link-libc-before-gnulib) $(gnulib) +link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ + $(common-objpfx)$(patsubst %,$(libtype.oS),c) \ + -Wl,--as-needed $(elf-objpfx)ld.so \ + -Wl,--no-as-needed +link-libc = $(link-libc-between-gnulib) $(gnulib) -link-libc-tests-after-rpath-link = $(link-libc-before-gnulib) $(gnulib-tests) +link-libc-tests-after-rpath-link = $(gnulib-tests) $(link-libc-between-gnulib) $(gnulib-tests) link-libc-tests = $(link-libc-tests-rpath-link) \ $(link-libc-tests-after-rpath-link) # Pretty printer test programs always require rpath instead of rpath-link. -- cgit 1.4.1