[SCM] master: Fix typo; match -L% not just -L.

cagney@sourceware.org cagney@sourceware.org
Tue Nov 27 15:56:00 GMT 2007


The branch, master has been updated
       via  f2d100dad2256b784de45495b1ea9a71e2b6ff5b (commit)
      from  ad02681a6d3702fbd7d4156c2280b74aef50c5eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit f2d100dad2256b784de45495b1ea9a71e2b6ff5b
Author: Andrew Cagney <cagney@redhat.com>
Date:   Tue Nov 27 10:55:55 2007 -0500

    Fix typo; match -L% not just -L.
    
    frysk-common/ChangeLog
    2007-11-27  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.rules (GEN_GCJ_SO_DIRS): Fix typo, match -L%.
    	(GEN_GCC_BUILDTREE_RPATHS): Delete.

-----------------------------------------------------------------------

Summary of changes:
 frysk-common/ChangeLog      |    5 +++++
 frysk-common/Makefile.rules |   14 ++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 9063d3b..3ee3af2 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-27  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.rules (GEN_GCJ_SO_DIRS): Fix typo, match -L%.
+	(GEN_GCC_BUILDTREE_RPATHS): Delete.
+
 2007-11-26  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.rules (GEN_GCJ_SO_FLAGS): Delete.
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 633ec41..84ae020 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -105,23 +105,25 @@ GEN_GCJ_LDADD_LIST =
 # RPATH to wire into in-build-tree program that need to access those
 # shared libraries.
 
-# Just the directories.
+# From the LDADD list extract a list of directories that contain (or
+# likely contain) shared libraries, i.e.: -L<paths> and <path-to>.so.
+
 GEN_GCJ_SO_DIRS = \
-	$(sort $(absdir $(foreach lib, $(GEN_GCJ_LDADD_LIST), \
+	$(sort $(foreach lib, $(GEN_GCJ_LDADD_LIST), \
 	       $(if $(filter -L%,$(lib)), \
-	       	    $(patsubst -L,%,$(lib))) \
+	       	    $(patsubst -L%,%,$(lib))) \
 	       $(if $(filter %.so,$(lib)), \
 	       	    $(patsubst %,-L%,$(dir $(lib)))) \
-	)))
+	))
+
 # Add absolute versions of each directory.
 GEN_GCJ_BUILDTREE_RPATHS = \
 	$(patsubst %/./,%, $(patsubst %/.,%, $(GEN_GCJ_SO_DIRS)))
 GEN_GCJ_BUILDTREE_RPATH = \
 	$(subst $(space),:,$(sort $(GEN_GCJ_BUILDTREE_RPATHS)))
-GEN_GCC_BUILDTREE_RPATHS = $(top_builddir)/elfutils/libdw
 GEN_GCJ_BUILDTREE_RPATH_FLAGS = \
 	-Djava.library.path=$(GEN_GCJ_BUILDTREE_RPATH) \
-	-Wl,-rpath,$(GEN_GCJ_BUILDTREE_RPATH):$(GEN_GCC_BUILDTREE_RPATHS)
+	-Wl,-rpath,$(GEN_GCC_BUILDTREE_RPATHS)
 
 # Prevent GCJ from creating child processes (or at least a feeble
 # attempt) -- children are created for both demangling and for


hooks/post-receive
--
frysk system monitor/debugger



More information about the Frysk-cvs mailing list