r189371 - CMake: Fix out-of-source build's symlinks.

[Reid Kleckner]

I reverted this in r189390 because my in-source build produces the clang
binary at build/bin/clang(.exe), and not build/tools/clang/bin/clang(.exe).

Failing builds here:
http://bb.pgr.jp/builders/cmake-clang-i686-mingw32/builds/3962
http://bb.pgr.jp/builders/clang-3stage-x86_64-linux/builds/2041

You can probably query the target to get the actual output path.


On Tue, Aug 27, 2013 at 9:59 AM, Jordan Rose <jordan_rose at apple.com> wrote:

> Author: jrose
> Date: Tue Aug 27 11:59:30 2013
> New Revision: 189371
>
> URL: http://llvm.org/viewvc/llvm-project?rev=189371&view=rev
> Log:
> CMake: Fix out-of-source build's symlinks.
>
> Symlinks to clang should go in Clang's build directory, not LLVM's.
>
> Modified:
>     cfe/trunk/tools/driver/CMakeLists.txt
>
> Modified: cfe/trunk/tools/driver/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/CMakeLists.txt?rev=189371&r1=189370&r2=189371&view=diff
>
> ==============================================================================
> --- cfe/trunk/tools/driver/CMakeLists.txt (original)
> +++ cfe/trunk/tools/driver/CMakeLists.txt Tue Aug 27 11:59:30 2013
> @@ -65,11 +65,11 @@ if(UNIX)
>    set(clang_binary "clang${CMAKE_EXECUTABLE_SUFFIX}")
>  else()
>    set(CLANGXX_LINK_OR_COPY copy)
> -  set(clang_binary
> "${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang${CMAKE_EXECUTABLE_SUFFIX}")
> +  set(clang_binary
> "${CLANG_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang${CMAKE_EXECUTABLE_SUFFIX}")
>  endif()
>
>  # Create the clang++ symlink in the build directory.
> -set(clang_pp
> "${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang++${CMAKE_EXECUTABLE_SUFFIX}")
> +set(clang_pp
> "${CLANG_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang++${CMAKE_EXECUTABLE_SUFFIX}")
>  add_custom_command(TARGET clang POST_BUILD
>      COMMAND ${CMAKE_COMMAND} -E ${CLANGXX_LINK_OR_COPY} "${clang_binary}"
> "${clang_pp}")
>
> @@ -77,7 +77,7 @@ set_property(DIRECTORY APPEND
>    PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${clang_pp})
>
>  # Create the clang-cl symlink in the build directory.
> -set(clang_cl
> "${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang-cl${CMAKE_EXECUTABLE_SUFFIX}")
> +set(clang_cl
> "${CLANG_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang-cl${CMAKE_EXECUTABLE_SUFFIX}")
>  add_custom_command(TARGET clang POST_BUILD
>      COMMAND ${CMAKE_COMMAND} -E ${CLANGXX_LINK_OR_COPY} "${clang_binary}"
> "${clang_cl}")
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130827/3a5a99e1/attachment.html>