2020-09-01 16:30:45 +00:00
|
|
|
From 4c7732daae8f0d2a622f91f5ff3add5c2248a2e3 Mon Sep 17 00:00:00 2001
|
2014-06-24 21:28:27 +00:00
|
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
|
Date: Tue, 24 Jun 2014 10:00:15 +0100
|
2020-08-21 07:55:06 +00:00
|
|
|
Subject: [PATCH 1/5] Don't add rpaths to libraries.
|
2014-06-24 21:28:27 +00:00
|
|
|
|
|
|
|
---
|
2017-11-06 12:39:44 +00:00
|
|
|
tools/Makefile | 4 ++--
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
2014-06-24 21:28:27 +00:00
|
|
|
|
2017-08-05 15:19:56 +00:00
|
|
|
diff --git a/tools/Makefile b/tools/Makefile
|
2020-08-21 07:55:06 +00:00
|
|
|
index dbad0b74f..c920a5337 100644
|
2017-08-05 15:19:56 +00:00
|
|
|
--- a/tools/Makefile
|
|
|
|
+++ b/tools/Makefile
|
2020-08-21 07:55:06 +00:00
|
|
|
@@ -154,8 +154,8 @@ $(call byte_and_opt,ocamlmklib,ocamlmklibconfig.cmo config.cmo \
|
2019-04-26 08:37:35 +00:00
|
|
|
ocamlmklibconfig.ml: $(ROOTDIR)/Makefile.config Makefile
|
2016-11-03 18:32:19 +00:00
|
|
|
(echo 'let bindir = "$(BINDIR)"'; \
|
2014-06-24 21:28:27 +00:00
|
|
|
echo 'let supports_shared_libraries = $(SUPPORTS_SHARED_LIBRARIES)';\
|
2017-11-06 12:39:44 +00:00
|
|
|
- echo 'let default_rpath = "$(RPATH)"'; \
|
2014-06-24 21:28:27 +00:00
|
|
|
- echo 'let mksharedlibrpath = "$(MKSHAREDLIBRPATH)"'; \
|
2017-11-06 12:39:44 +00:00
|
|
|
+ echo 'let default_rpath = ""'; \
|
2014-06-24 21:28:27 +00:00
|
|
|
+ echo 'let mksharedlibrpath = ""'; \
|
2019-04-26 08:37:35 +00:00
|
|
|
echo 'let toolpref = "$(TOOLPREF)"';) \
|
2014-06-24 21:28:27 +00:00
|
|
|
> ocamlmklibconfig.ml
|
2019-04-26 08:37:35 +00:00
|
|
|
|
2014-06-24 21:28:27 +00:00
|
|
|
--
|
2020-08-04 11:29:58 +00:00
|
|
|
2.28.0.rc2
|
2014-06-24 21:28:27 +00:00
|
|
|
|