components/developer/gcc-12/patches/0038-OOCE-Adjust-default-library-paths-for-OmniOS.patch

   1 From a6f4f67abba5667063b062cef0201c2ddbd3bb0d 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 | 6 ++----
   8  1 file changed, 2 insertions(+), 4 deletions(-)
   9
  10 diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
  11 index 7cb9dfe3312..34e34f79e5f 100644
  12 --- a/gcc/config/sol2.h
  13 +++ b/gcc/config/sol2.h
  14 @@ -308,8 +308,7 @@ 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,*:-Y P,%R/usr/gcc/12/lib:%R/lib:%R/usr/lib -L %R/usr/gcc/12/lib -R %R/usr/gcc/12/lib}"
  21
  22  #undef LINK_ARCH32_SPEC
  23  #define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE
  24 @@ -320,8 +319,7 @@ along with GCC; see the file COPYING3.  If not see
  25  #define LINK_ARCH64_SPEC_BASE \
  26    "%{YP,*} \
  27     %{R*} \
  28 -   %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}        \
  29 -          %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}}}"
  30 +   %{!YP,*:-Y P,%R/usr/gcc/12/lib/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR " -L %R/usr/gcc/12/lib/" ARCH64_SUBDIR " -R %R/usr/gcc/12/lib/" ARCH64_SUBDIR "}"
  31
  32  #undef LINK_ARCH64_SPEC
  33  #ifndef USE_GLD