From 293392ba3c5d0d50d831960f14f87c8c1e91c3a2 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 9 May 2019 13:43:30 +0000 Subject: OOCE: Adjust default library paths for OmniOS --- gcc/config/sol2.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h index 98c35aa4dcb..b20c92956ba 100644 --- a/gcc/config/sol2.h +++ b/gcc/config/sol2.h @@ -308,8 +308,8 @@ along with GCC; see the file COPYING3. If not see #define LINK_ARCH32_SPEC_BASE \ "%{YP,*} \ %{R*} \ - %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp%R/lib:%R/usr/lib} \ - %{!p:%{!pg:-Y P,%R/lib:%R/usr/lib}}}" + %{!YP,*:%{p|pg:-Y P,%R/usr/gcc/11/lib:%R/lib:%R/usr/lib -R %R/usr/gcc/11/lib -L %R/usr/gcc/11/lib} \ + %{!p:%{!pg:-Y P,%R/usr/gcc/11/lib:%R/lib:%R/usr/lib -R %R/usr/gcc/11/lib -L %R/usr/gcc/11/lib}}}" #undef LINK_ARCH32_SPEC #define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE @@ -320,8 +320,8 @@ along with GCC; see the file COPYING3. If not see #define LINK_ARCH64_SPEC_BASE \ "%{YP,*} \ %{R*} \ - %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "} \ - %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}}}" + %{!YP,*:%{p|pg:-Y P,%R/usr/gcc/11/lib/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR " -R %R/usr/gcc/11/lib/" ARCH64_SUBDIR " -L %R/usr/gcc/11/lib/" ARCH64_SUBDIR "} \ + %{!p:%{!pg:-Y P,%R/usr/gcc/11/lib/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR " -R %R/usr/gcc/11/lib/" ARCH64_SUBDIR " -L %R/usr/gcc/11/lib/" ARCH64_SUBDIR "}}}" #undef LINK_ARCH64_SPEC #ifndef USE_GLD