2017-07-17 10:15:49 +00:00
|
|
|
From d56e6c1562eb5052789f4e7272d5bd523c8c7b2f 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
|
2017-07-17 10:15:49 +00:00
|
|
|
Subject: [PATCH 1/8] Don't add rpaths to libraries.
|
2014-06-24 21:28:27 +00:00
|
|
|
|
|
|
|
---
|
2017-07-17 10:15:49 +00:00
|
|
|
tools/Makefile | 6 +++---
|
2014-06-24 21:28:27 +00:00
|
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
2017-07-17 10:15:49 +00:00
|
|
|
diff --git a/tools/Makefile b/tools/Makefile
|
|
|
|
index 9a8cf652b..269aa18e6 100644
|
|
|
|
--- a/tools/Makefile
|
|
|
|
+++ b/tools/Makefile
|
|
|
|
@@ -156,9 +156,9 @@ $(call byte_and_opt,ocamlmklib,ocamlmklibconfig.cmo config.cmo misc.cmo \
|
2016-11-03 18:32:19 +00:00
|
|
|
ocamlmklibconfig.ml: ../config/Makefile Makefile
|
|
|
|
(echo 'let bindir = "$(BINDIR)"'; \
|
2014-06-24 21:28:27 +00:00
|
|
|
echo 'let supports_shared_libraries = $(SUPPORTS_SHARED_LIBRARIES)';\
|
|
|
|
- echo 'let byteccrpath = "$(BYTECCRPATH)"'; \
|
|
|
|
- echo 'let nativeccrpath = "$(NATIVECCRPATH)"'; \
|
|
|
|
- echo 'let mksharedlibrpath = "$(MKSHAREDLIBRPATH)"'; \
|
|
|
|
+ echo 'let byteccrpath = ""'; \
|
|
|
|
+ echo 'let nativeccrpath = ""'; \
|
|
|
|
+ echo 'let mksharedlibrpath = ""'; \
|
|
|
|
echo 'let toolpref = "$(TOOLPREF)"'; \
|
|
|
|
sed -n -e 's/^#ml //p' ../config/Makefile) \
|
|
|
|
> ocamlmklibconfig.ml
|
|
|
|
--
|
2017-06-26 09:53:06 +00:00
|
|
|
2.13.1
|
2014-06-24 21:28:27 +00:00
|
|
|
|