diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-08-26 18:41:28 +0400 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-08-26 18:41:28 +0400 |
| commit | 8f946e7bf1af54b8b695af4f6de6dec1d5c892cc (patch) | |
| tree | 1451e9f4012ff6f816ab7887bef640faed062e34 | |
| parent | a626f4eeb06c43596176af7053f5289458eca492 (diff) | |
Don't set HOST_LIB_PATH_bfd/HOST_LIB_PATH_opcodes
PR binutils/4970
* Makefile.def (host_modules): Rmove lib_path=.libs from bfd
and opcodes.
* Makefile.in: Regenerated.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.def | 4 | ||||
| -rw-r--r-- | Makefile.in | 12 |
3 files changed, 10 insertions, 13 deletions
@@ -1,3 +1,10 @@ +2012-08-26 H.J. Lu <hongjiu.lu@intel.com> + + PR binutils/4970 + * Makefile.def (host_modules): Rmove lib_path=.libs from bfd + and opcodes. + * Makefile.in: Regenerated. + 2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. diff --git a/Makefile.def b/Makefile.def index b9e301419..0639faca3 100644 --- a/Makefile.def +++ b/Makefile.def @@ -32,8 +32,8 @@ build_modules= { module= m4; }; build_modules= { module= texinfo; }; build_modules= { module= fixincludes; }; -host_modules= { module= bfd; lib_path=.libs; bootstrap=true; }; -host_modules= { module= opcodes; lib_path=.libs; bootstrap=true; }; +host_modules= { module= bfd; bootstrap=true; }; +host_modules= { module= opcodes; bootstrap=true; }; host_modules= { module= binutils; bootstrap=true; }; host_modules= { module= bison; no_check_cross= true; }; host_modules= { module= cgen; }; diff --git a/Makefile.in b/Makefile.in index 0d2566681..0108162d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -605,7 +605,7 @@ TARGET_LIB_PATH_libatomic = $$r/$(TARGET_SUBDIR)/libatomic/.libs: # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the host machine work. -HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)$(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf) +HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf) # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch @if gcc @@ -613,16 +613,6 @@ HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc$(GCC_SHLIB_SUBDIR):$$r/$(HOST_SUBDIR) @endif gcc -@if bfd -HOST_LIB_PATH_bfd = \ - $$r/$(HOST_SUBDIR)/bfd/.libs:$$r/$(HOST_SUBDIR)/prev-bfd/.libs: -@endif bfd - -@if opcodes -HOST_LIB_PATH_opcodes = \ - $$r/$(HOST_SUBDIR)/opcodes/.libs:$$r/$(HOST_SUBDIR)/prev-opcodes/.libs: -@endif opcodes - @if gmp HOST_LIB_PATH_gmp = \ $$r/$(HOST_SUBDIR)/gmp/.libs:$$r/$(HOST_SUBDIR)/prev-gmp/.libs: |