diff options
| author | Ilya Biryukov <ibiryukov@google.com> | 2017-08-28 15:12:24 +0000 |
|---|---|---|
| committer | Ilya Biryukov <ibiryukov@google.com> | 2017-08-28 15:12:24 +0000 |
| commit | 867e36de383e843b3908b18a964b71cf768e5b22 (patch) | |
| tree | 21b1b332f3869c48d4a4751fc6588e0fb80c350e /llvm/utils | |
| parent | 3876077ac730b2df09ae1a0e37226ea89d349cb0 (diff) | |
| download | bcm5719-llvm-867e36de383e843b3908b18a964b71cf768e5b22.tar.gz bcm5719-llvm-867e36de383e843b3908b18a964b71cf768e5b22.zip | |
Changed Dockerfiles to install LLVM into /usr/local
Summary:
Previously, the installation path was simply '/'.
Using '/usr/local' would ensure that LLVM installation does not
conflict with software installed via package managers.
Reviewers: mehdi_amini, klimek
Reviewed By: klimek
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D37213
llvm-svn: 311890
Diffstat (limited to 'llvm/utils')
| -rw-r--r-- | llvm/utils/docker/debian8/release/Dockerfile | 2 | ||||
| -rw-r--r-- | llvm/utils/docker/example/release/Dockerfile | 2 | ||||
| -rw-r--r-- | llvm/utils/docker/nvidia-cuda/release/Dockerfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/llvm/utils/docker/debian8/release/Dockerfile b/llvm/utils/docker/debian8/release/Dockerfile index 03f027a779a..3a44a7d4116 100644 --- a/llvm/utils/docker/debian8/release/Dockerfile +++ b/llvm/utils/docker/debian8/release/Dockerfile @@ -18,4 +18,4 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # Unpack clang installation into this image. -ADD clang.tar.gz / +ADD clang.tar.gz /usr/local/ diff --git a/llvm/utils/docker/example/release/Dockerfile b/llvm/utils/docker/example/release/Dockerfile index 5387dd082f7..b088ad885ac 100644 --- a/llvm/utils/docker/example/release/Dockerfile +++ b/llvm/utils/docker/example/release/Dockerfile @@ -21,4 +21,4 @@ LABEL maintainer "Maintainer <maintainer@email>" # Unpack clang installation into this container. # It is copied to this directory by build_docker_image.sh script. -ADD clang.tar.gz / +ADD clang.tar.gz /usr/local/ diff --git a/llvm/utils/docker/nvidia-cuda/release/Dockerfile b/llvm/utils/docker/nvidia-cuda/release/Dockerfile index b9bcae15978..a30d7d7e91e 100644 --- a/llvm/utils/docker/nvidia-cuda/release/Dockerfile +++ b/llvm/utils/docker/nvidia-cuda/release/Dockerfile @@ -18,6 +18,6 @@ FROM nvidia/cuda:8.0-devel LABEL maintainer "LLVM Developers" # Unpack clang installation into this container. -ADD clang.tar.gz / +ADD clang.tar.gz /usr/local/ # C++ standard library and binutils are already included in the base package. |
