0300-ld-makefile.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001
  2. From: Romain Naour <romain.naour@gmail.com>
  3. Date: Fri, 25 Dec 2015 11:40:53 +0100
  4. Subject: [PATCH] ld-makefile
  5. [Romain: rebase on top of 2.26]
  6. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  7. ---
  8. ld/Makefile.am | 2 +-
  9. ld/Makefile.in | 2 +-
  10. 2 files changed, 2 insertions(+), 2 deletions(-)
  11. diff --git a/ld/Makefile.am b/ld/Makefile.am
  12. index 0b3b049..3871c74 100644
  13. --- a/ld/Makefile.am
  14. +++ b/ld/Makefile.am
  15. @@ -57,7 +57,7 @@ endif
  16. # We put the scripts in the directory $(scriptdir)/ldscripts.
  17. # We can't put the scripts in $(datadir) because the SEARCH_DIR
  18. # directives need to be different for native and cross linkers.
  19. -scriptdir = $(tooldir)/lib
  20. +scriptdir = $(libdir)
  21. EMUL = @EMUL@
  22. EMULATION_OFILES = @EMULATION_OFILES@
  23. diff --git a/ld/Makefile.in b/ld/Makefile.in
  24. index ed98f87..530e4c9 100644
  25. --- a/ld/Makefile.in
  26. +++ b/ld/Makefile.in
  27. @@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
  28. # We put the scripts in the directory $(scriptdir)/ldscripts.
  29. # We can't put the scripts in $(datadir) because the SEARCH_DIR
  30. # directives need to be different for native and cross linkers.
  31. -scriptdir = $(tooldir)/lib
  32. +scriptdir = $(libdir)
  33. BASEDIR = $(srcdir)/..
  34. BFDDIR = $(BASEDIR)/bfd
  35. INCDIR = $(BASEDIR)/include
  36. --
  37. 2.4.3