This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


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

PATCH: Trivial fix-up for GC 6.1 Alpha 1 roll.


GC 6.1 Alpha 1 was rolled into the gcc tree (Thanks Bryce).
`make check' (in out-of-source-directory configuration) was broken.
This seems to be the change of interest:

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/boehm-gc/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -c -r1.27 -r1.28
*** Makefile.am	2001/09/12 01:57:03	1.27
--- Makefile.am	2001/10/16 09:01:34	1.28
***************
*** 51,57 ****
  # The following hack produces a warning from automake, but we need it in order 
  # to build a file from a subdirectory. FIXME.
  test.o:	tests/test.c
! 	$(COMPILE) -c $<
  gctest_OBJECTS = test.o
  gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
  gctest_LDFLAGS = -shared-libgcc
--- 51,59 ----
  # The following hack produces a warning from automake, but we need it in order 
  # to build a file from a subdirectory. FIXME.
  test.o:	tests/test.c
! 	$(COMPILE) -c tests/test.c
! # 	Using $< in the above seems to fail with the HP/UX on Itanium make.
! 
  gctest_OBJECTS = test.o
  gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
  gctest_LDFLAGS = -shared-libgcc

Noting the new comment, I propose this patch:

[Tested on i386-unknown-freebsd4.3 in already bootstrapped tree.]

2001-10-16  Loren J. Rittle  <ljrittle@acm.org>

	* Makefile.am (test.o): Find tests/test.c in $(srcdir).
	* Makefile.in: Rebuilt.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/boehm-gc/Makefile.am,v
retrieving revision 1.28
diff -c -r1.28 Makefile.am
*** Makefile.am	2001/10/16 09:01:34	1.28
--- Makefile.am	2001/10/17 02:03:36
***************
*** 51,57 ****
  # The following hack produces a warning from automake, but we need it in order 
  # to build a file from a subdirectory. FIXME.
  test.o:	tests/test.c
! 	$(COMPILE) -c tests/test.c
  # 	Using $< in the above seems to fail with the HP/UX on Itanium make.
  
  gctest_OBJECTS = test.o
--- 51,57 ----
  # The following hack produces a warning from automake, but we need it in order 
  # to build a file from a subdirectory. FIXME.
  test.o:	tests/test.c
! 	$(COMPILE) -c $(srcdir)/tests/test.c
  # 	Using $< in the above seems to fail with the HP/UX on Itanium make.
  
  gctest_OBJECTS = test.o


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