[llvm-commits] [llvm] r143662 - /llvm/trunk/Makefile.rules

[Chandler Carruth]

On Thu, Feb 16, 2012 at 7:07 PM, Sebastian Pop <spop at codeaurora.org> wrote:

> Hi Daniel,
>
> On Thu, Nov 3, 2011 at 5:46 PM, Daniel Dunbar <daniel at zuster.org> wrote:
> > Author: ddunbar
> > Date: Thu Nov  3 17:46:21 2011
> > New Revision: 143662
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=143662&view=rev
> > Log:
> > build/Make: Integrate llvm-build into Makefiles.
> >  - Basically, we coordinate with llvm-build to create a Makefile
> fragment we can
> >   easily use. For now, nothing is wired in except the support to
> automatically
> >   regenerate this file when necessary.
> >
> > Modified:
> >    llvm/trunk/Makefile.rules
> >
> > Modified: llvm/trunk/Makefile.rules
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=143662&r1=143661&r2=143662&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/Makefile.rules (original)
> > +++ llvm/trunk/Makefile.rules Thu Nov  3 17:46:21 2011
> > @@ -57,6 +57,54 @@
> >
> >  $(UserTargets)::
> >
> >
> +#------------------------------------------------------------------------
> > +# LLVMBuild Integration
> >
> +#------------------------------------------------------------------------
> > +#
> > +# We use llvm-build to generate all the data required by the Makefile
> based
> > +# build system in one swoop:
> > +#
> > +#  - We generate a file (a Makefile fragment) in the object root which
> contains
> > +#    all the definitions that are required by Makefiles across the
> entire
> > +#    project.
> > +#
> > +#  - We generate the library table used by llvm-config.
> > +#
> > +#  - We generate the dependencies for the Makefile fragment, so that we
> will
> > +#    automatically reconfigure outselves.
> > +
> > +# The path to the llvm-build tool itself.
> > +LLVMBuildTool  := $(PROJ_SRC_ROOT)/utils/llvm-build/llvm-build
>
> This line most likely should be:
>
> LLVMBuildTool  := $(LLVM_SRC_ROOT)/utils/llvm-build/llvm-build
>
> otherwise projects like Polly would fail to find llvm-build in their
> utils subdir: i.e., llvm/tools/polly/utils/llvm-build/llvm-build
>
> With the attached patch polly configures and builds again properly.
> Ok to commit?
>

My only question is do we need to retain a dependency on the
project-specific Makefile.rules in addition to the top-level Makefile.rules?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20120216/81ef5bab/attachment.html>