[llvm-commits] [llvm] r125964 - /llvm/trunk/tools/Makefile

[Stephen Wilson]

Owen Anderson <resistor at mac.com> writes:

> Author: resistor
> Date: Fri Feb 18 15:33:23 2011
> New Revision: 125964
>
> URL: http://llvm.org/viewvc/llvm-project?rev=125964&view=rev
> Log:
> Revert r125956, which broke the build if you _don't_ have lldb checked out.

Damn.  Thanks for reverting.  Testing a patch to fixup Makefile.rules
when doing in-tree builds.

Thanks again,


>
> Modified:
>     llvm/trunk/tools/Makefile
>
> Modified: llvm/trunk/tools/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=125964&r1=125963&r2=125964&view=diff
> ==============================================================================
> --- llvm/trunk/tools/Makefile (original)
> +++ llvm/trunk/tools/Makefile Fri Feb 18 15:33:23 2011
> @@ -12,10 +12,6 @@
>  # Build clang if present.
>  OPTIONAL_PARALLEL_DIRS := clang
>
> -# Build LLDB if present. Note LLDB must be built last as it depends on the
> -# wider LLVM infrastructure (including Clang).
> -OPTIONAL_DIRS := lldb
> -
>  # NOTE: The tools are organized into five groups of four consisting of one
>  # large and three small executables. This is done to minimize memory load
>  # in parallel builds.  Please retain this ordering.
> @@ -30,8 +26,7 @@
>  # Let users override the set of tools to build from the command line.
>  ifdef ONLY_TOOLS
>    OPTIONAL_PARALLEL_DIRS :=
> -  OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS))
> -  PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS))
> +  PARALLEL_DIRS := $(ONLY_TOOLS)
>  endif
>
>  include $(LEVEL)/Makefile.config
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



--
steve