[llvmlinux] make llvm-sync: Typo in llvm-reset target/phony?

[Behan Webster]

On 07/13/13 13:44, Sedat Dilek wrote:
> Hi,
>
> with this applied 'make llvm-sync' runs as expected:
>
> --- a/toolchain/clang/clang.mk
> +++ b/toolchain/clang/clang.mk
> @@ -269,7 +269,7 @@ ${LLVMSTATE}/clang-unpatched-build:
> ${LLVMSTATE}/llvm-unpatched-build ${LLVMSTAT
>          $(call state,$@)
>
>   ##############################################################################
> -llvm-reset: ${LLVMSTATE}/clang-fetch
> +llvm-reset: ${LLVMSTATE}/llvm-fetch
>   #${LLVMSTATE}/compilerrt-fetch
>   # Patched LLVM
>          @$(call banner,Cleaning LLVM...)
>
> $ cd targets/x86_64/
> $ LC_ALL=C make CONFIG=checkpoints/config.mk llvm-sync
> ---------------------------------------------------------------------
> Fetching LLVM...
> ---------------------------------------------------------------------
> Cloning into '/home/wearefam/src/llvmlinux/llvmlinux-git/toolchain/clang/src/llvm'...
> ^Cmake: *** [/home/wearefam/src/llvmlinux/llvmlinux-git/toolchain/clang/state/llvm-fetch]
> Interrupt
>
> Without this, clang sources are fetched!
That certainly looks like a bug.

I've credited you for the fix.

>
> $ egrep 'llvm-reset|clang-reset' ../../toolchain/clang/clang.mk
> llvm-reset: ${LLVMSTATE}/llvm-fetch
> llvm-clean: llvm-reset llvm-clean-noreset clang-clean
> clang-reset: ${LLVMSTATE}/clang-fetch
> clang-clean: clang-reset clang-clean-noreset
>
> Dunno, why llvm-clean phony/target has clang-clean.
>
The clang build is dependent on the llvm build (headers and libraries). 
Since we use stamp files to stop pointless rebuilds, it seemed safer 
that a llvm-clean implied a clang-clean too. I suppose we could just 
remove the clang-build stamp file and let dependency checking take over...

Behan

-- 
Behan Webster
behanw at converseincode.com