Fix lldb build instructions and scripts.

For CentOS 7, Fedora 24 and OpenSUSE.

diff --git a/documentation/lldb/centos7/build-install-lldb.sh b/documentation/lldb/centos7/build-install-lldb.sh
index 651dd964ca0f70b7fd3c5381caf90e644f197cfc..7493a80589d0e5f55a0bfea9b62415633dafd983 100755 (executable)
--- a/documentation/lldb/centos7/build-install-lldb.sh
+++ b/documentation/lldb/centos7/build-install-lldb.sh
@@ -1,6 +1,3 @@
-# These are needed to build lldb 3.9
-sudo yum install doxygen libedit-devel libxml2-devel python-argparse python-devel readline-devel swig xz
-
 cd $HOME
 wget http://ftp.gnu.org/gnu/binutils/binutils-2.29.1.tar.xz
 wget http://releases.llvm.org/3.9.1/cfe-3.9.1.src.tar.xz
@@ -31,7 +28,3 @@ cd ..
 rm -r llvmbuild
 rm -r llvm-3.9.1.src
 rm -r binutils-2.29.1
-
-# Remove the no longer needed packages 
-sudo yum remove doxygen libedit-devel libxml2-devel python-argparse python-devel readline-devel swig xz
-sudo yum clean all

diff --git a/documentation/lldb/fedora24/build-install-lldb.sh b/documentation/lldb/fedora24/build-install-lldb.sh
index 6a7797431ddc6f7068d41cb28ecd961e449a105a..456277aa2fcbea742d2b3e4f8d622399345a2bd4 100755 (executable)
--- a/documentation/lldb/fedora24/build-install-lldb.sh
+++ b/documentation/lldb/fedora24/build-install-lldb.sh
@@ -1,6 +1,3 @@
-# These are needed to build lldb
-sudo dnf install doxygen libedit-devel libxml2-devel python-argparse python-devel readline-devel swig xz
-
 cd $HOME
 wget http://releases.llvm.org/3.9.1/cfe-3.9.1.src.tar.xz
 wget http://releases.llvm.org/3.9.1/llvm-3.9.1.src.tar.xz
@@ -24,7 +21,3 @@ sudo make install
 cd ..
 rm -r llvmbuild
 rm -r llvm-3.9.1.src
-
-# Remove the no longer needed packages 
-sudo dnf remove doxygen libedit-devel libxml2-devel readline-devel swig
-sudo dnf clean all

diff --git a/documentation/lldb/linux-instructions.md b/documentation/lldb/linux-instructions.md
index 5ee9d5952173641689d70f70659ac8bdc017e696..e91865a3ee0bba9beb6d81876a0db6822ccc0afb 100644 (file)
--- a/documentation/lldb/linux-instructions.md
+++ b/documentation/lldb/linux-instructions.md
@@ -93,16 +93,20 @@ First the prerequisites:
 
     sudo yum install centos-release-SCL epel-release
     sudo yum install cmake cmake3 gcc gcc-c++ git libicu libunwind make python27 tar wget which zip
+    sudo yum install doxygen libedit-devel libxml2-devel python-argparse python-devel readline-devel swig xz
 
 Now build and install llvm/lldb 3.9 using the script provided here: [build-install-lldb.sh](../lldb/centos7/build-install-lldb.sh).
 
-WARNING: this script installs llvm and lldb and may overwrite any previously installed versions.
+WARNING: This script installs llvm and lldb as root (via sudo) and may overwrite any previously installed versions.
 
     cd $HOME
     git clone https://github.com/dotnet/diagnostics.git
     $HOME/diagnostics/documentation/lldb/centos7/build-install-lldb.sh
 
-This will take some time to complete.
+This will take some time to complete. After the build is finished, run these commands to remove the no longer needed packages:
+
+    sudo yum remove doxygen libedit-devel libxml2-devel python-argparse python-devel readline-devel swig xz
+    sudo yum clean all
 
 To launch lldb:
 
@@ -138,16 +142,20 @@ To launch lldb:
 #### Fedora 24 ####
 
     sudo dnf install clang cmake findutils git libicu libunwind make python tar wget which zip
+    sudo dnf install doxygen libedit-devel libxml2-devel python-argparse python-devel readline-devel swig xz
 
 Now build and install llvm/lldb 3.9 using the script provided here: [build-install-lldb.sh](../lldb/fedora24/build-install-lldb.sh).
 
-WARNING: this script installs llvm and lldb and may overwrite any previously installed versions.
+WARNING: This script installs llvm and lldb as root (via sudo) and may overwrite any previously installed versions.
 
     cd $HOME
     git clone https://github.com/dotnet/diagnostics.git
     $HOME/diagnostics/documentation/lldb/fedora24/build-install-lldb.sh
 
-This will take some time to complete.
+This will take some time to complete. After the build is finished, run these commands to remove the no longer needed packages:
+
+    sudo dnf remove doxygen libedit-devel libxml2-devel readline-devel swig
+    sudo dnf clean all
 
 To launch lldb:
 
@@ -164,17 +172,20 @@ To launch lldb:
 #### OpenSuse 42.1, 42.3 ####
 
     sudo zypper install cmake gcc-c++ git hostname libicu libunwind lldb-devel llvm-clang llvm-devel make python python-xml tar wget which zip
-    ln -s /usr/bin/clang++ /usr/bin/clang++-3.5
+    sudo zypper install doxygen libedit-devel libxml2-devel ncurses-devel python-argparse python-devel readline-devel swig
 
 Now build and install llvm/lldb 3.9 using the script provided here: [build-install-lldb.sh](../lldb/opensuse/build-install-lldb.sh).
 
-WARNING: this script installs llvm and lldb and may overwrite any previously installed versions.
+WARNING: This script installs llvm and lldb as root (via sudo) and may overwrite any previously installed versions.
 
     cd $HOME
     git clone https://github.com/dotnet/diagnostics.git
     $HOME/diagnostics/documentation/lldb/opensuse/build-install-lldb.sh
 
-This will take some time to complete.
+This will take some time to complete. After the build is finished, run these commands to remove the no longer needed packages:
+
+    sudo zypper rm doxygen libedit-devel libxml2-devel ncurses-devel python-argparse python-devel readline-devel swig
+    sudo zypper clean -a
 
 To launch lldb:
 

diff --git a/documentation/lldb/opensuse/build-install-lldb.sh b/documentation/lldb/opensuse/build-install-lldb.sh
index 61716fa209cc6a91a3f364a5bf17d4b660531a4f..b9135b89990f6886a38a824cedcfc3445ef61114 100755 (executable)
--- a/documentation/lldb/opensuse/build-install-lldb.sh
+++ b/documentation/lldb/opensuse/build-install-lldb.sh
@@ -1,6 +1,3 @@
-# These are need to build lldb
-sudo zypper install doxygen libedit-devel libxml2-devel ncurses-devel python-argparse python-devel readline-devel swig
-
 cd $HOME
 
 wget http://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz
@@ -29,8 +26,3 @@ cd ..
 rm -r llvmbuild
 rm -r llvm-3.9.1.src
 rm -r cmake-3.11.4-Linux-x86_64
-
-# Remove the no longer needed packages 
-sudo zypper rm doxygen libedit-devel libxml2-devel ncurses-devel python-argparse python-devel readline-devel swig
-sudo zypper clean -a
-