diff options
| author | Ilya Biryukov <ibiryukov@google.com> | 2017-07-06 12:46:51 +0000 |
|---|---|---|
| committer | Ilya Biryukov <ibiryukov@google.com> | 2017-07-06 12:46:51 +0000 |
| commit | 7f02a75a7446889eded064b0e012c50306dbde48 (patch) | |
| tree | 410a0d57a95aadf9a11c561e4a7f2521d7ed4721 /llvm/docs | |
| parent | 77ad6d9bb247932ac2f04dee7df70f216399a715 (diff) | |
| download | bcm5719-llvm-7f02a75a7446889eded064b0e012c50306dbde48.tar.gz bcm5719-llvm-7f02a75a7446889eded064b0e012c50306dbde48.zip | |
Made a script to build docker images easier to use.
Summary:
- Removed double indirection via command-line args (i.e. two `--`
options of `build_docker_image.sh`).
- Added a comment on how to build 2-stage clang install into the
`build_docker_image.sh`, it used to be only in the `docs/Docker.rst`.
Reviewers: klimek, mehdi_amini
Reviewed By: klimek
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D35050
llvm-svn: 307256
Diffstat (limited to 'llvm/docs')
| -rw-r--r-- | llvm/docs/Docker.rst | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/llvm/docs/Docker.rst b/llvm/docs/Docker.rst index d873e1ebeeb..e606e1b71a2 100644 --- a/llvm/docs/Docker.rst +++ b/llvm/docs/Docker.rst @@ -88,15 +88,11 @@ compiled by the system compiler in the debian8 image: ./llvm/utils/docker/build_docker_image.sh \ --source debian8 \ --docker-repository clang-debian8 --docker-tag "staging" \ - -- \ -p clang -i install-clang -i install-clang-headers \ -- \ -DCMAKE_BUILD_TYPE=Release -Note there are two levels of ``--`` indirection. First one separates -``build_docker_image.sh`` arguments from ``llvm/utils/build_install_llvm.sh`` -arguments. Second one separates CMake arguments from ``build_install_llvm.sh`` -arguments. Note that build like that doesn't use a 2-stage build process that +Note that a build like that doesn't use a 2-stage build process that you probably want for clang. Running a 2-stage build is a little more intricate, this command will do that: @@ -108,7 +104,6 @@ this command will do that: ./build_docker_image.sh \ --source debian8 \ --docker-repository clang-debian8 --docker-tag "staging" \ - -- \ -p clang -i stage2-install-clang -i stage2-install-clang-headers \ -- \ -DLLVM_TARGETS_TO_BUILD=Native -DCMAKE_BUILD_TYPE=Release \ @@ -178,7 +173,6 @@ debian8-based image using the latest ``google/stable`` sources for you: ./llvm/utils/docker/build_docker_image.sh \ -s debian8 --d clang-debian8 -t "staging" \ - -- \ --branch branches/google/stable \ -p clang -i install-clang -i install-clang-headers \ -- \ |
