bug#45934: native-comp - Dylib ID of ELN files not optimal

[Lars Ingebrigtsen]

OK, back to the ostensible subject of this bug report.

This is what the current trunk currently gives us:

bash-3.2$ otool -D 
native-lisp/28_0_50-395a4a99/preloaded/x-win-3c49581f-3fe8af32.eln 
native-lisp/28_0_50-395a4a99/preloaded/x-win-3c49581f-3fe8af32.eln:
/var/folders/09/qpnlh75n3t70kt9dcw8jlqb80000gn/T//libgccjit-BikCmL/fake.so

And with Andrea's patch it...  er...  segfaults...

Let's try a "make bootstrap" and see whether that helps.  ... Yup, now
it compiles fine.

And:

bash-3.2$ otool -D 
native-lisp/28_0_50-395a4a99/preloaded/x-win-3c49581f-3fe8af32.eln 
native-lisp/28_0_50-395a4a99/preloaded/x-win-3c49581f-3fe8af32.eln:
/var/folders/09/qpnlh75n3t70kt9dcw8jlqb80000gn/T//libgccjit-Lge08S/fake.so

So...  it had no effect?  This was the patch I applied:

diff --git a/src/comp.c b/src/comp.c                                            
index c380346482..6347c015cd 100644                                             
--- a/src/comp.c                                                                
+++ b/src/comp.c                                                                
@@ -4490,6 +4490,16 @@ DEFUN ("comp--compile-ctxt-to-file", Fcomp__compile_ctxt\
_to_file,                                                                       
                                  GCC_JIT_INT_OPTION_OPTIMIZATION_LEVEL,        
                                  comp.speed < 0 ? 0                            
                                  : (comp.speed > 3 ? 3 : comp.speed));         
+                                                                               
+/* On MacOS set a unique dylib ID (Bug#45934). */                              
+#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option) \               
+  && defined (DARWIN_OS)                                                       
+  gcc_jit_context_add_driver_option (                                          
+    comp.ctxt,                                                                 
+    SSDATA (concat2 (build_string ("-dynamiclib -install_name "),              
+                    Ffile_name_nondirectory (filename))));                     
+#endif                                                                         
+                                                                               
   comp.d_default_idx =                                                         
     CALL1I (comp-data-container-idx, CALL1I (comp-ctxt-d-default, Vcomp_ctxt))\
;                                                                               
   comp.d_impure_idx =                                                          



-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no