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]

gold: fix testsuite dependencies.


This patch avoids a link error with 'make -j2 check': all programs in
testsuite/ which do not have a *_LDADD statement use the default LDADD.
OK to commit?

(The next Automake version will allow to specify EXTRA_prog_DEPENDENCIES
that add to, instead of override, automake-computed prog_DEPENDENCIES.)

Thanks,
Ralf

gold: fix testsuite dependencies.

gold/ChangeLog:
2010-12-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* testsuite/Makefile.am (ifuncmain2static_DEPENDENCIES)
	(ifuncmain2_DEPENDENCIES, ifuncmain4static_DEPENDENCIES)
	(ifuncmain4_DEPENDENCIES, ifuncmain5static_DEPENDENCIES)
	(ifuncmain5_DEPENDENCIES, ifuncmain7static_DEPENDENCIES)
	(ifuncmain7_DEPENDENCIES): Add $(DEPENDENCIES).
	* testsuite/Makefile.in: Regenerate.

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 530b5be..db98d31 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -1619,7 +1619,7 @@ ifuncdep2pic.o: ifuncdep2.c
 
 check_PROGRAMS += ifuncmain2static
 ifuncmain2static_SOURCES = ifuncmain2.c ifuncdep2.c
-ifuncmain2static_DEPENDENCIES = gcctestdir/ld
+ifuncmain2static_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
 ifuncmain2static_LDFLAGS = -Bgcctestdir/ -static
 
 check_PROGRAMS += ifuncmain2picstatic
@@ -1628,7 +1628,7 @@ ifuncmain2picstatic: ifuncmain2pic.o ifuncdep2pic.o gcctestdir/ld
 
 check_PROGRAMS += ifuncmain2
 ifuncmain2_SOURCES = ifuncmain2.c ifuncdep2.c
-ifuncmain2_DEPENDENCIES = gcctestdir/ld
+ifuncmain2_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
 ifuncmain2_LDFLAGS = -Bgcctestdir/
 
 check_PROGRAMS += ifuncmain2pic
@@ -1651,7 +1651,7 @@ ifuncmain4pic.o: ifuncmain4.c
 
 check_PROGRAMS += ifuncmain4static
 ifuncmain4static_SOURCES = ifuncmain4.c
-ifuncmain4static_DEPENDENCIES = gcctestdir/ld
+ifuncmain4static_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
 ifuncmain4static_LDFLAGS = -Bgcctestdir/ -static
 
 check_PROGRAMS += ifuncmain4picstatic
@@ -1660,7 +1660,7 @@ ifuncmain4picstatic: ifuncmain4pic.o gcctestdir/ld
 
 check_PROGRAMS += ifuncmain4
 ifuncmain4_SOURCES = ifuncmain4.c
-ifuncmain4_DEPENDENCIES = gcctestdir/ld
+ifuncmain4_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
 ifuncmain4_LDFLAGS = -Bgcctestdir/
 
 ifuncmain5pic.o: ifuncmain5.c
@@ -1679,7 +1679,7 @@ ifuncdep5.o: ifuncmod5.c
 
 check_PROGRAMS += ifuncmain5static
 ifuncmain5static_SOURCES = ifuncmain5.c
-ifuncmain5static_DEPENDENCIES = gcctestdir/ld ifuncdep5.o
+ifuncmain5static_DEPENDENCIES = gcctestdir/ld ifuncdep5.o $(DEPENDENCIES)
 ifuncmain5static_LDFLAGS = -Bgcctestdir/ -static
 ifuncmain5static_LDADD = ifuncdep5.o
 
@@ -1689,7 +1689,7 @@ ifuncmain5picstatic: ifuncmain5pic.o ifuncmod5.o gcctestdir/ld
 
 check_PROGRAMS += ifuncmain5
 ifuncmain5_SOURCES = ifuncmain5.c
-ifuncmain5_DEPENDENCIES = gcctestdir/ld ifuncmod5.so
+ifuncmain5_DEPENDENCIES = gcctestdir/ld ifuncmod5.so $(DEPENDENCIES)
 ifuncmain5_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
 ifuncmain5_LDADD = ifuncmod5.so
 
@@ -1725,7 +1725,7 @@ ifuncmain7pie.o: ifuncmain7.c
 
 check_PROGRAMS += ifuncmain7static
 ifuncmain7static_SOURCES = ifuncmain7.c
-ifuncmain7static_DEPENDENCIES = gcctestdir/ld
+ifuncmain7static_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
 ifuncmain7static_LDFLAGS = -Bgcctestdir/ -static
 
 check_PROGRAMS += ifuncmain7picstatic
@@ -1734,7 +1734,7 @@ ifuncmain7picstatic: ifuncmain7pic.o gcctestdir/ld
 
 check_PROGRAMS += ifuncmain7
 ifuncmain7_SOURCES = ifuncmain7.c
-ifuncmain7_DEPENDENCIES = gcctestdir/ld
+ifuncmain7_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
 ifuncmain7_LDFLAGS = -Bgcctestdir/
 
 check_PROGRAMS += ifuncmain7pic


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