[cfe-commits] r116689 - in /cfe/trunk/tools/driver: CMakeLists.txt clang_symlink.cmake

[Oscar Fuentes]

Author: ofv
Date: Sun Oct 17 11:10:32 2010
New Revision: 116689

URL: http://llvm.org/viewvc/llvm-project?rev=116689&view=rev
Log:
Use a script for creating the clang++ executable.

The previous method used the DESTDIR environment variable at configure
time, but sometimes it is only available at install time. See PR8397.

Added:
    cfe/trunk/tools/driver/clang_symlink.cmake
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=116689&r1=116688&r2=116689&view=diff
==============================================================================
--- cfe/trunk/tools/driver/CMakeLists.txt (original)
+++ cfe/trunk/tools/driver/CMakeLists.txt Sun Oct 17 11:10:32 2010
@@ -35,7 +35,6 @@
 
 if(UNIX)
   set(CLANGXX_LINK_OR_COPY create_symlink)
-  set(CLANGXX_DESTDIR $ENV{DESTDIR}/)
 else()
   set(CLANGXX_LINK_OR_COPY copy)
 endif()
@@ -51,4 +50,4 @@
   RUNTIME DESTINATION bin)
 
 # Create the clang++ symlink at installation time.
-install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E ${CLANGXX_LINK_OR_COPY} \"${CMAKE_INSTALL_PREFIX}/bin/clang${CMAKE_EXECUTABLE_SUFFIX}\" \"${CLANGXX_DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/clang++${CMAKE_EXECUTABLE_SUFFIX}\")")
+install(SCRIPT clang_symlink.cmake -DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\")

Added: cfe/trunk/tools/driver/clang_symlink.cmake
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/clang_symlink.cmake?rev=116689&view=auto
==============================================================================
--- cfe/trunk/tools/driver/clang_symlink.cmake (added)
+++ cfe/trunk/tools/driver/clang_symlink.cmake Sun Oct 17 11:10:32 2010
@@ -0,0 +1,18 @@
+# We need to execute this script at installation time because the
+# DESTDIR environment variable may be unset at configuration time.
+# See PR8397.
+
+if(UNIX)
+  set(CLANGXX_LINK_OR_COPY create_symlink)
+  set(CLANGXX_DESTDIR $ENV{DESTDIR})
+else()
+  set(CLANGXX_LINK_OR_COPY copy)
+endif()
+
+set(bindir "${CLANGXX_DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/")
+set(clang "${bindir}clang${CMAKE_EXECUTABLE_SUFFIX}")
+set(clangxx "${bindir}clang++${CMAKE_EXECUTABLE_SUFFIX}")
+
+message("Creating clang++ executable based on ${clang}")
+
+execute_process(COMMAND "${CMAKE_COMMAND}" -E ${CLANGXX_LINK_OR_COPY} "${clang}" "${clangxx}")