From 67851f1c53e830bac735f607e9c2c935fa49df9b Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Thu, 16 Feb 2017 03:55:20 -0500 Subject: [PATCH] [Unix] Fix arm/lldb rootfs breakage (dotnet/coreclr#9625) Commit migrated from https://github.com/dotnet/coreclr/commit/31595eb30a077cb4983ea3ed7fb1ebf37cdf218c --- src/coreclr/cross/build-rootfs.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/coreclr/cross/build-rootfs.sh b/src/coreclr/cross/build-rootfs.sh index c40d644..955bb77 100755 --- a/src/coreclr/cross/build-rootfs.sh +++ b/src/coreclr/cross/build-rootfs.sh @@ -5,7 +5,7 @@ usage() echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount]" echo "BuildArch can be: arm(default), armel, arm64, x86" echo "LinuxCodeName - optional, Code name for Linux, can be: trusty(default), vivid, wily, xenial. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo "lldbx.y - optional, LLDB version, can be: lldb3.6, lldb3.8" + echo "lldbx.y - optional, LLDB version, can be: lldb3.6(default), lldb3.8, no-lldb" echo "--skipunmount - optional, will skip the unmount of rootfs folder." exit 1 } @@ -16,7 +16,7 @@ __InitialDir=$PWD __BuildArch=arm __UbuntuArch=armhf __UbuntuRepo="http://ports.ubuntu.com/" -__LLDB_Package="" +__LLDB_Package_Default="lldb-3.6-dev" __SkipUnmount=0 # base development support @@ -70,6 +70,9 @@ for i in "$@" ; do lldb3.8) __LLDB_Package="lldb-3.8-dev" ;; + no-lldb) + unset __LLDB_Package + ;; vivid) if [ "$__LinuxCodeName" != "jessie" ]; then __LinuxCodeName=vivid -- 2.7.4