summaryrefslogtreecommitdiff
path: root/Makefile.direct
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2017-03-22 11:23:37 +0300
committerIvan Maidanski <ivmai@mail.ru>2017-03-22 11:29:52 +0300
commit4dfe88e052d90b684e85471b13b9ea7a256afdf3 (patch)
treed70d2ada011b4eb48e27b400637dee996987df42 /Makefile.direct
parentc179eecedf07c1ee6d7d71b2841021bbfb522601 (diff)
downloadbdwgc-4dfe88e052d90b684e85471b13b9ea7a256afdf3.tar.gz
New target (check-cpp) to avoid Makefile.direct parallel build issue
* Makefile.direct: Add comment about check-cpp. * Makefile.direct (test_cpp): Replace dependency on "c++" with "gc_cpp.o base_lib"; link with gc_cpp.o directly. * Makefile.direct (check-cpp): New target (same as c++-t but do not depend on c++ target and pass no arguments to test_cpp).
Diffstat (limited to 'Makefile.direct')
-rw-r--r--Makefile.direct12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.direct b/Makefile.direct
index 57852903..6327f98e 100644
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -8,6 +8,7 @@
# check - prints porting information, then builds basic version of gc.a,
# and runs some tests of collector and cords. Does not add cords or
# c++ interface to gc.a
+# check-cpp - runs C++ test without adding C++ (and cords) interface to gc.a
# cord/de - builds dumb editor based on cords.
ABI_FLAG=
@@ -254,10 +255,13 @@ 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 $(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`
+test_cpp: $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h \
+ gc_cpp.o 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`
+
+check-cpp: test_cpp
+ ./test_cpp
c++-t: c++ test_cpp
./test_cpp 1