This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH: Fix cross build in opcodes and binutils


Hi,

Cross build failed since tarrget flags were used with build compiler.
I am checking in this patch as an obvious fix.

BTW, Ralf, in opcodes, I got

hjl@gnu-6 opcodes]$  PATH=/opt/gnu/bin:$PATH automake   Makefile
Makefile.am:23: bfdlibdir was already defined in condition TRUE, which
includes condition INSTALL_LIBBFD ...
configure.in:53: ... `bfdlibdir' previously defined here
Makefile.am:24: bfdincludedir was already defined in condition TRUE,
which includes condition INSTALL_LIBBFD ...
configure.in:53: ... `bfdincludedir' previously defined here
Makefile.am:29: bfdlibdir was already defined in condition TRUE, which
includes condition !INSTALL_LIBBFD ...
configure.in:53: ... `bfdlibdir' previously defined here
Makefile.am:30: bfdincludedir was already defined in condition TRUE,
which includes condition !INSTALL_LIBBFD ...
configure.in:53: ... `bfdincludedir' previously defined here
[hjl@gnu-6 opcodes]$ 

Is that normal?

Thanks.


H.J.
---
Index: binutils/Makefile.in
===================================================================
--- binutils/Makefile.in	(revision 6664)
+++ binutils/Makefile.in	(working copy)
@@ -1205,24 +1205,24 @@ sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sy
 	./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
 
 sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
-	$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o
 
 syslex.o: syslex.c sysinfo.h config.h
 	if [ -r syslex.c ]; then \
-	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) syslex.c -Wno-error ; \
+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \
 	else \
-	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/syslex.c -Wno-error ;\
+	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\
 	fi
 
 sysinfo.o: sysinfo.c
 	if [ -r sysinfo.c ]; then \
-	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) sysinfo.c -Wno-error ; \
+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \
 	else \
-	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) $(srcdir)/sysinfo.c -Wno-error ; \
+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \
 	fi
 
 bin2c$(EXEEXT_FOR_BUILD):
-	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c
+	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c
 
 embedspu: embedspu.sh
 	sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@
Index: binutils/ChangeLog
===================================================================
--- binutils/ChangeLog	(revision 6664)
+++ binutils/ChangeLog	(working copy)
@@ -1,3 +1,12 @@
+2009-08-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (sysinfo$(EXEEXT_FOR_BUILD)): Replace
+	CFLAGS/LDFLAGS with CFLAGS_FOR_BUILD/LDFLAGS_FOR_BUILD.
+	(syslex.o): Likewise.
+	(sysinfo.o): Likewise.
+	(bin2c$(EXEEXT_FOR_BUILD)): Likewise.
+	* Makefile.in: Regenerated.
+
 2009-08-27  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* doc/binutils.texi (--only-keep-debug): Relocate stray para here ...
Index: binutils/Makefile.am
===================================================================
--- binutils/Makefile.am	(revision 6664)
+++ binutils/Makefile.am	(working copy)
@@ -257,24 +257,24 @@ sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sy
 	./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
 
 sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
-	$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o
 
 syslex.o: syslex.c sysinfo.h config.h
 	if [ -r syslex.c ]; then \
-	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) syslex.c -Wno-error ; \
+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \
 	else \
-	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/syslex.c -Wno-error ;\
+	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\
 	fi
 
 sysinfo.o: sysinfo.c
 	if [ -r sysinfo.c ]; then \
-	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) sysinfo.c -Wno-error ; \
+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \
 	else \
-	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) $(srcdir)/sysinfo.c -Wno-error ; \
+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \
 	fi
 
 bin2c$(EXEEXT_FOR_BUILD):
-	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c
+	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c
 
 embedspu: embedspu.sh
 	sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@
Index: opcodes/ChangeLog
===================================================================
--- opcodes/ChangeLog	(revision 6664)
+++ opcodes/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2009-08-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (COMPILE_FOR_BUILD): Remove BUILD_CPPFLAGS.
+	Replace BUILD_CFLAGS with CFLAGS_FOR_BUILD.
+	(LINK_FOR_BUILD): Replace BUILD_CFLAGS/BUILD_LDFLAGS with
+	CFLAGS_FOR_BUILD/LDFLAGS_FOR_BUILD.
+	* Makefile.in: Regenerated.
+
 2009-08-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* Makefile.am (bfdlibdir, bfdincludedir): Move definition ...
Index: opcodes/Makefile.am
===================================================================
--- opcodes/Makefile.am	(revision 6664)
+++ opcodes/Makefile.am	(working copy)
@@ -14,8 +14,9 @@ NO_WERROR = @NO_WERROR@
 AM_CFLAGS = $(WARN_CFLAGS)
 
 COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(BUILD_CPPFLAGS) $(BUILD_CFLAGS)
-LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@
+	$(CFLAGS_FOR_BUILD)
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
+	$(LDFLAGS_FOR_BUILD) -o $@
 
 libopcodes_la_LDFLAGS =
 if INSTALL_LIBBFD
Index: opcodes/Makefile.in
===================================================================
--- opcodes/Makefile.in	(revision 6664)
+++ opcodes/Makefile.in	(working copy)
@@ -291,9 +291,11 @@ INCDIR = $(srcdir)/../include
 BFDDIR = $(srcdir)/../bfd
 AM_CFLAGS = $(WARN_CFLAGS)
 COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(BUILD_CPPFLAGS) $(BUILD_CFLAGS)
+	$(CFLAGS_FOR_BUILD)
+
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
+	$(LDFLAGS_FOR_BUILD) -o $@
 
-LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@
 libopcodes_la_LDFLAGS = $(am__append_1) -release `cat \
 	../bfd/libtool-soversion` @SHARED_LDFLAGS@
 @INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libopcodes.la


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]