diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-16 11:12:28 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-16 11:12:28 -0800 |
| commit | acd62293044746e2203911990721ecfd502938f8 (patch) | |
| tree | 2773f431160f3c3814230b16b2294563ec45182d /tools | |
| parent | e3018e6f7d86cea35b2bc7f76e0b722b1ed7851b (diff) | |
| parent | 361c5be0561bbd27a40b03eb215ab00f6900fd1a (diff) | |
Merge github.com:grpc/grpc into sopb
Conflicts:
Makefile
templates/Makefile.template
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/grpc_clang/Dockerfile (renamed from tools/dockerfile/msan_cxx/Dockerfile) | 5 | ||||
| -rwxr-xr-x | tools/gce_setup/grpc_docker.sh | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/dockerfile/msan_cxx/Dockerfile b/tools/dockerfile/grpc_clang/Dockerfile index d12cee6b5d..0928121755 100644 --- a/tools/dockerfile/msan_cxx/Dockerfile +++ b/tools/dockerfile/grpc_clang/Dockerfile @@ -23,7 +23,10 @@ RUN mv libcxx llvm/projects RUN mv libcxxabi llvm/projects RUN mkdir llvm-build -RUN cd llvm-build && cmake ../llvm +RUN cd llvm-build && cmake \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DLLVM_TARGETS_TO_BUILD:STRING=X86 \ + ../llvm RUN make -C llvm-build && make -C llvm-build install && rm -rf llvm-build CMD ["bash"] diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh index 2e02653864..1c38582cb8 100755 --- a/tools/gce_setup/grpc_docker.sh +++ b/tools/gce_setup/grpc_docker.sh @@ -24,6 +24,10 @@ # Allows gcloud ssh commands to run on freshly started docker instances. _grpc_ensure_gcloud_ssh() { local default_key_file="$HOME/.ssh/google_compute_engine" + if [ "$HOME" == "/" ] + then + default_key_file="/root/.ssh/google_compute_engine" + fi [ -f $default_key_file ] || { ssh-keygen -f $default_key_file -N '' > /dev/null || { echo "could not precreate $default_key_file" 1>&2 |