diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-09-13 18:58:14 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-09-13 18:58:14 +0000 |
| commit | 1026c163c82d4d3481548bf69a18ac10ebd728c6 (patch) | |
| tree | a379f8a58f1934786033a55810790602a7a22cc3 /Makefile.rules | |
| parent | 2055bb31a5adba60719871bd4b1ec3bd45cb1f97 (diff) | |
| download | llvm-1026c163c82d4d3481548bf69a18ac10ebd728c6.tar.gz llvm-1026c163c82d4d3481548bf69a18ac10ebd728c6.tar.bz2 llvm-1026c163c82d4d3481548bf69a18ac10ebd728c6.tar.xz | |
Revert unittests build changes temporarily, the unit test build isn't -j safe.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81692 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.rules b/Makefile.rules index 7999c7a3ca..8d1e621845 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -19,11 +19,10 @@ #-------------------------------------------------------------------- # Define the various target sets #-------------------------------------------------------------------- -RecursiveTargets := all clean clean-all install uninstall install-bytecode \ - unitcheck +RecursiveTargets := all clean clean-all install uninstall install-bytecode LocalTargets := all-local clean-local clean-all-local check-local \ install-local printvars uninstall-local \ - install-bytecode-local + install-bytecode-local unittests TopLevelTargets := check dist dist-check dist-clean dist-gzip dist-bzip2 \ dist-zip unittests UserTargets := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets) @@ -801,7 +800,6 @@ clean-all:: $(addsuffix /.makeclean-all,$(PARALLEL_DIRS)) install :: $(addsuffix /.makeinstall ,$(PARALLEL_DIRS)) uninstall:: $(addsuffix /.makeuninstall,$(PARALLEL_DIRS)) install-bytecode :: $(addsuffix /.makeinstall-bytecode,$(PARALLEL_DIRS)) -unitcheck:: $(addsuffix /.makeunitcheck,$(PARALLEL_DIRS)) ParallelTargets := $(foreach T,$(RecursiveTargets),%/.make$(T)) @@ -1621,7 +1619,7 @@ unittests:: $(Verb) if test -d "$(PROJ_OBJ_ROOT)/unittests" ; then \ if test -f "$(PROJ_OBJ_ROOT)/unittests/Makefile" ; then \ $(EchoCmd) Running unittests test suite ; \ - $(MAKE) -C $(PROJ_OBJ_ROOT)/unittests unitcheck; \ + $(MAKE) -C $(PROJ_OBJ_ROOT)/unittests ; \ else \ $(EchoCmd) No Makefile in unittests directory ; \ fi ; \ |