components/developer/gcc-11/patches/0036-OOCE-Adjust-default-library-paths-for-OmniOS.patch

   1 From 293392ba3c5d0d50d831960f14f87c8c1e91c3a2 Mon Sep 17 00:00:00 2001
   2 From: Andy Fiddaman <omnios@citrus-it.co.uk>
   3 Date: Thu, 9 May 2019 13:43:30 +0000
   4 Subject: OOCE: Adjust default library paths for OmniOS
   5
   6 ---
   7  gcc/config/sol2.h | 8 ++++----
   8  1 file changed, 4 insertions(+), 4 deletions(-)
   9
  10 diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
  11 index 98c35aa4dcb..b20c92956ba 100644
  12 --- a/gcc/config/sol2.h
  13 +++ b/gcc/config/sol2.h
  14 @@ -308,8 +308,8 @@ along with GCC; see the file COPYING3.  If not see
  15  #define LINK_ARCH32_SPEC_BASE \
  16    "%{YP,*} \
  17     %{R*} \
  18 -   %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp%R/lib:%R/usr/lib} \
  19 -          %{!p:%{!pg:-Y P,%R/lib:%R/usr/lib}}}"
  20 +   %{!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} \
  21 +          %{!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}}}"
  22
  23  #undef LINK_ARCH32_SPEC
  24  #define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE
  25 @@ -320,8 +320,8 @@ along with GCC; see the file COPYING3.  If not see
  26  #define LINK_ARCH64_SPEC_BASE \
  27    "%{YP,*} \
  28     %{R*} \
  29 -   %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}        \
  30 -          %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}}}"
  31 +   %{!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 "}        \
  32 +          %{!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 "}}}"
  33
  34  #undef LINK_ARCH64_SPEC
  35  #ifndef USE_GLD