Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From f96cf1f4eaa72860ab8b5e18ad10fdc704d78c5f Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 15 Dec 2015 15:01:34 +0200 |
| 4 | Subject: [PATCH 2/5] remove rpath |
| 5 | |
| 6 | Upstream-Status: Inappropriate [embedded config] |
| 7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
| 8 | --- |
| 9 | none/tests/Makefile.am | 3 +-- |
| 10 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 11 | |
| 12 | diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am |
| 13 | index 54f2a7e..25b0f49 100644 |
| 14 | --- a/none/tests/Makefile.am |
| 15 | +++ b/none/tests/Makefile.am |
| 16 | @@ -326,7 +326,6 @@ threadederrno_CFLAGS += --std=c99 |
| 17 | endif |
| 18 | tls_SOURCES = tls.c tls2.c |
| 19 | tls_DEPENDENCIES = tls.so tls2.so |
| 20 | -tls_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests |
| 21 | tls_LDADD = tls.so tls2.so -lpthread |
| 22 | tls_so_SOURCES = tls_so.c |
| 23 | tls_so_DEPENDENCIES = tls2.so |
| 24 | @@ -334,7 +333,7 @@ if VGCONF_OS_IS_DARWIN |
| 25 | tls_so_LDFLAGS = -dynamic -dynamiclib -all_load -fpic |
| 26 | tls_so_LDADD = `pwd`/tls2.so |
| 27 | else |
| 28 | - tls_so_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests -shared -fPIC |
| 29 | + tls_so_LDFLAGS = -shared -fPIC |
| 30 | tls_so_LDADD = tls2.so |
| 31 | endif |
| 32 | tls_so_CFLAGS = $(AM_CFLAGS) -fPIC |
| 33 | -- |
| 34 | 2.6.2 |
| 35 | |