diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2017-03-20 11:33:37 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2017-03-20 11:33:37 +0300 |
| commit | 41db6f84f91461e6409e848324e2958471301fa9 (patch) | |
| tree | 532424f628f8a515809b1c60cf1057cb4bfc07ea /Makefile.direct | |
| parent | a83901c82024720a54bdcf8ab4befa5142573c21 (diff) | |
| download | bdwgc-41db6f84f91461e6409e848324e2958471301fa9.tar.gz | |
Fix test_cpp and c++ parallel build in Makefile.direct
* 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).
Diffstat (limited to 'Makefile.direct')
| -rw-r--r-- | Makefile.direct | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.direct b/Makefile.direct index bf5c3b7a..4af64fb0 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -253,10 +253,10 @@ 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) - ./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` +test_cpp: $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h c++ \ + $(UTILS) + ./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 |