From 9727f17edf71cd98ca7df4d92764275049aaec65 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sun, 17 Jun 2018 15:21:47 +0000 Subject: [PATCH] Tweaks to pp custom build environment. --- tools/linux_control/build_in_docker.sh | 8 ++++++-- tools/setup_builds.sh | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/linux_control/build_in_docker.sh b/tools/linux_control/build_in_docker.sh index 4d152e8ea..c111b9ad0 100644 --- a/tools/linux_control/build_in_docker.sh +++ b/tools/linux_control/build_in_docker.sh @@ -1,3 +1,7 @@ #!/bin/bash -cid=`docker ps | grep bluetradingsystems/linux_docker | awk '{print $1}'` -docker exec $cid /bin/bash -c "cd build/clang_debug/ && ninja" +if [ -f /.dockerenv ]; then + ninja +else + cid=`docker ps | grep bluetradingsystems/linux_docker | awk '{print $1}'` + docker exec $cid /bin/bash -c "cd build/clang_debug/ && ninja" +fi diff --git a/tools/setup_builds.sh b/tools/setup_builds.sh index 31cb437d5..4f80643e9 100755 --- a/tools/setup_builds.sh +++ b/tools/setup_builds.sh @@ -6,7 +6,7 @@ cd $DIR/../build/ rm -rf clang_debug mkdir clang_debug cd clang_debug -cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=`realpath ../../tools/linux_control/rtags.sh` ../.. +cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CXX_COMPILER=`realpath ../../tools/linux_control/rtags.sh` ../.. cd .. rm -rf ninja_debug @@ -18,7 +18,7 @@ cd .. rm -rf ninja_release mkdir ninja_release cd ninja_release -cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CXX_COMPILER=g++ ../.. +cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ ../.. cd ..