From 04478923d048b3127925a9b2c515319c14dc2e13 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 20 Mar 2017 11:33:37 +0300 Subject: [PATCH] Fix test_cpp and c++ parallel build in Makefile.direct (Cherry-pick commit 41db6f8 from 'master' branch.) * Makefile.direct (test_cpp): Add dependency on c++ (and remove dependency on base_lib and gc_cpp.o); do not link with gc_cpp.o directly (it should be in gc.a). --- Makefile.direct | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.direct b/Makefile.direct index 109838d5..37551d00 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -253,11 +253,11 @@ cords: $(CORD_OBJS) cord/cordtest $(UTILS) base_lib gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h $(CXX) -c $(CXXFLAGS) $(srcdir)/gc_cpp.cc -test_cpp: $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h gc_cpp.o $(srcdir)/include/gc.h \ - base_lib $(UTILS) +test_cpp: $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h c++ \ + $(UTILS) rm -f test_cpp - ./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs` - ./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a `./threadlibs` + ./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc.a -ldld `./threadlibs` + ./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc.a `./threadlibs` c++-t: c++ test_cpp ./test_cpp 1 -- 2.40.0