| Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 1 | From 6d608326970b1613633d7715ebb7d628dfcd16ee Mon Sep 17 00:00:00 2001 |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 2 | From: Christopher Larson <chris_larson@mentor.com> |
| 3 | Date: Thu, 5 May 2016 10:59:07 -0700 |
| Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 4 | Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 5 | |
| 6 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
| Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 7 | Upstream-Status: Pending |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 8 | --- |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 9 | template/Makefile.in | 2 +- |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 12 | diff --git a/template/Makefile.in b/template/Makefile.in |
| Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 13 | index fa1e19ef37..bbd07fa34b 100644 |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 14 | --- a/template/Makefile.in |
| 15 | +++ b/template/Makefile.in |
| Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 16 | @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 17 | ENABLE_SHARED = @ENABLE_SHARED@ |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 18 | LDSHARED = @LIBRUBY_LDSHARED@ |
| Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 19 | DLDSHARED = @DLDSHARED@ |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 20 | -DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) |
| 21 | +DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) |
| 22 | SOLIBS = @SOLIBS@ |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 23 | ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 24 | MAINLIBS = @MAINLIBS@ |
| Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 25 | -- |
| 26 | 2.23.0.rc1 |
| 27 | |