diff options
| author | Evgeny Pavlov <lucenticus@gmail.com> | 2016-04-28 15:38:51 +0400 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-04-28 04:38:51 -0700 |
| commit | 50d2b7c240cc2c6cd8419f13c33236f2d2e3e85c (patch) | |
| tree | ecb570d60abe689675c5bd3df6a24591c0d8a63c /cross | |
| parent | c8a355dc6c1f8211119ef149a069d803bd6a76f8 (diff) | |
| download | coreclr-50d2b7c240cc2c6cd8419f13c33236f2d2e3e85c.tar.gz coreclr-50d2b7c240cc2c6cd8419f13c33236f2d2e3e85c.tar.bz2 coreclr-50d2b7c240cc2c6cd8419f13c33236f2d2e3e85c.zip | |
Initial support of lldb-3.8 for libsosplugin (#4473)
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/arm-softfp/toolchain.cmake | 12 | ||||
| -rw-r--r-- | cross/arm/toolchain.cmake | 12 | ||||
| -rwxr-xr-x | cross/build-rootfs.sh | 7 |
3 files changed, 25 insertions, 6 deletions
diff --git a/cross/arm-softfp/toolchain.cmake b/cross/arm-softfp/toolchain.cmake index 9c8ca3e914..a85c152f3c 100644 --- a/cross/arm-softfp/toolchain.cmake +++ b/cross/arm-softfp/toolchain.cmake @@ -24,5 +24,13 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/arm-linux-gnueabi" CACHE STRING "") -set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "") +set(LLVM_ARM_DIR "$ENV{LLVM_ARM_HOME}") +if(LLVM_ARM_DIR) + set(WITH_LLDB_LIBS "${LLVM_ARM_DIR}/lib/" CACHE STRING "") + set(WITH_LLDB_INCLUDES "${LLVM_ARM_DIR}/include" CACHE STRING "") + set(LLDB_H "${WITH_LLDB_INCLUDES}" CACHE STRING "") + set(LLDB "${LLVM_ARM_DIR}/lib/liblldb.so" CACHE STRING "") +else() + set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "") + set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "") +endif() diff --git a/cross/arm/toolchain.cmake b/cross/arm/toolchain.cmake index 9cc92798af..84ae2a593e 100644 --- a/cross/arm/toolchain.cmake +++ b/cross/arm/toolchain.cmake @@ -34,5 +34,13 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "") -set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "") +set(LLVM_ARM_DIR "$ENV{LLVM_ARM_HOME}") +if(LLVM_ARM_DIR) + set(WITH_LLDB_LIBS "${LLVM_ARM_DIR}/lib/" CACHE STRING "") + set(WITH_LLDB_INCLUDES "${LLVM_ARM_DIR}/include" CACHE STRING "") + set(LLDB_H "${WITH_LLDB_INCLUDES}" CACHE STRING "") + set(LLDB "${LLVM_ARM_DIR}/lib/liblldb.so" CACHE STRING "") +else() + set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "") + set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "") +endif() diff --git a/cross/build-rootfs.sh b/cross/build-rootfs.sh index 25a46a08a9..dc093b8675 100755 --- a/cross/build-rootfs.sh +++ b/cross/build-rootfs.sh @@ -18,6 +18,9 @@ __UbuntuArch=armhf __UbuntuRepo="http://ports.ubuntu.com/" __UbuntuPackagesBase="build-essential libunwind8-dev gettext symlinks liblttng-ust-dev libicu-dev" __UbuntuPackages="$__UbuntuPackagesBase" +if [ -z "$LLVM_ARM_HOME" ]; then + __LLDB_Package="lldb-3.6-dev" +fi __MachineTriple=arm-linux-gnueabihf __UnprocessedBuildArgs= for i in "$@" @@ -31,7 +34,7 @@ for i in "$@" arm) __BuildArch=arm __UbuntuArch=armhf - __UbuntuPackages="$__UbuntuPackagesBase lldb-3.6-dev" + __UbuntuPackages="$__UbuntuPackagesBase $__LLDB_Package" __MachineTriple=arm-linux-gnueabihf ;; arm64) @@ -44,7 +47,7 @@ for i in "$@" __BuildArch=arm-softfp __UbuntuArch=armel __UbuntuRepo="http://ftp.debian.org/debian/" - __UbuntuPackages="$__UbuntuPackagesBase lldb-3.6-dev" + __UbuntuPackages="$__UbuntuPackagesBase $__LLDB_Package" __MachineTriple=arm-linux-gnueabi __UbuntuCodeName=jessie ;; |