From 0b55a33ebe733e0c7cc955db8caa280a8184c607 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 4 Mar 2014 17:22:46 +0000 Subject: [PATCH] Remove default-manifest from ALL_EMUL_EXTRA_BINARIES so that it is not mistakenly built when constructing a toolchain configued from all targets. * Makefile.am (ALL_EMUL_EXTRA_BINARIES): Remove default-manifest. * Makefile.in: Regenerate. --- ld/ChangeLog | 5 +++++ ld/Makefile.am | 3 +-- ld/Makefile.in | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 57120d15fb9..12e92b6a751 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2014-03-04 Nick Clifton + + * Makefile.am (ALL_EMUL_EXTRA_BINARIES): Remove default-manifest. + * Makefile.in: Regenerate. + 2014-02-27 Yuri Gribov * emultempl/armelf.em (OPTION_LONG_PLT): Define. diff --git a/ld/Makefile.am b/ld/Makefile.am index e15dfac15a9..a7e98959912 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -491,8 +491,7 @@ ALL_EMUL_EXTRA_OFILES = \ pe-dll.@OBJEXT@ \ pep-dll.@OBJEXT@ -ALL_EMUL_EXTRA_BINARIES = \ - default-manifest.@OBJEXT@ +ALL_EMUL_EXTRA_BINARIES = CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 1a3d9ac0d9a..e411db7be34 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -797,8 +797,7 @@ ALL_EMUL_EXTRA_OFILES = \ pe-dll.@OBJEXT@ \ pep-dll.@OBJEXT@ -ALL_EMUL_EXTRA_BINARIES = \ - default-manifest.@OBJEXT@ +ALL_EMUL_EXTRA_BINARIES = CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ -- 2.30.2