Commit c7ce0c86 authored by Boey Maun Suang's avatar Boey Maun Suang
Browse files

gnat12: Fix GNAT Darwin dylib install names

parent a584587b

pkgs/development/compilers/gcc/12/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ let majorVersion = "12"; 
      # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin

      ++ optional (stdenv.isDarwin && langAda) ../ada-cctools-as-detection-configure.patch



      # Use absolute path in GNAT dylib install names on Darwin

      ++ optional (stdenv.isDarwin && langAda) ../gnat-darwin-dylib-install-name.patch



      # Obtain latest patch with ../update-mcfgthread-patches.sh

      ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch;

pkgs/development/compilers/gcc/gnat-darwin-dylib-install-name.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
--- a/gcc/ada/gcc-interface/Makefile.in	2022-08-19 18:09:52.000000000 +1000

+++ b/gcc/ada/gcc-interface/Makefile.in	2023-01-11 01:54:06.000000000 +1100

@@ -795,14 +795,14 @@

 		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \

 		$(SO_OPTS) \

-		-Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

+		-Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		$(MISCLIB)

 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \

                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -dynamiclib $(PICFLAG_FOR_TARGET) \

 		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		$(GNATRTL_TASKING_OBJS) \

 		$(SO_OPTS) \

-		-Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

+		-Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		$(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)

 	cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		libgnat$(soext)