This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] Minor Cygwin/ld Makefile tweak
- From: Christopher Faylor <cgf-use-the-mailinglist-please at sourceware dot org>
- To: binutils at sourceware dot org
- Date: Mon, 17 Mar 2014 10:17:15 -0400
- Subject: [PATCH] Minor Cygwin/ld Makefile tweak
- Authentication-results: sourceware.org; auth=none
ld's makefile currently tries to use the in-tree version of
windres which obviously won't work if you're cross-compiling.
Ok to check in the below change?
cgf
2014-03-17 Christopher Faylor <me.cygwin2014@cgf.cx>
* Makefile.am: Use host version of windres.
* Makefile.in: Regenerate.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index fe674c4..e89a6c1 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1927,7 +1927,7 @@ eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \
# Rule to create a manifest file for Cygwin and Mingw.
default-manifest.o: $(srcdir)/emultempl/default-manifest.rc
- ../binutils/windres -o $@ $<
+ ${WINDRES} -o $@ $<
# We need this for automake to use YLWRAP.
EXTRA_ld_new_SOURCES = deffilep.y ldlex.l
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 46126f8..0c14694 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -3359,7 +3359,7 @@ eshlelf64_nbsd.c: $(srcdir)/emulparams/shlelf64_nbsd.sh \
# Rule to create a manifest file for Cygwin and Mingw.
default-manifest.o: $(srcdir)/emultempl/default-manifest.rc
- ../binutils/windres -o $@ $<
+ ${WINDRES} -o $@ $<
check-DEJAGNU: site.exp
srcroot=`cd $(srcdir) && pwd`; export srcroot; \