[gjs] Revert "build: Use -R instead of -rpath"



commit 26471ad4c13c615761518b3aebf395b983fff498
Author: Giovanni Campagna <scampa giovanni gmail com>
Date:   Sun Dec 21 18:56:52 2014 +0100

    Revert "build: Use -R instead of -rpath"
    
    This reverts commit 7eafe015998a3f5505505bf7858857c184a66d00.
    
    This was wrong, -R and -rpath have different meaning in libtool,
    and -R does not force a shared library like we want.

 Makefile-insttest.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile-insttest.am b/Makefile-insttest.am
index 58f75b4..bee59f9 100644
--- a/Makefile-insttest.am
+++ b/Makefile-insttest.am
@@ -53,7 +53,7 @@ endif
 # This rpath /nowhere thing is the libtool upstream recommended way to
 # force generation of shared libraries, which we need in order for the
 # tests to work uninstalled.
-common_test_ldflags = -avoid-version -R /nowhere
+common_test_ldflags = -avoid-version -rpath /nowhere
 common_test_libadd = $(GJS_LIBS)
 
 nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]