X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=configure;h=978b71e5c61bcacf44486984c266d27733c53798;hb=4ab6ad136b62add35598f3c354231701b7c14c65;hp=384cfcf956e46af0a1b646edc7fc86114a993464;hpb=3a533cd561eb75deab489d5ab39a7ec4e1bf7952;p=vpp.git

diff --git a/configure b/configure
index 384cfcf956e..978b71e5c61 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o pipefail -o errtrace -o nounset -o errexit
 
 # Experimental script, please consult with dmarion@me.com before
 # submitting any changes
@@ -8,6 +9,7 @@ build_dir=.
 install_dir=/usr/local
 build_type=release
 prefix_path=/opt/vpp/external/$(uname -m)/
+src_dir="$(dirname "$(readlink -f "$0")")"
 
 help()
 {
@@ -20,7 +22,7 @@ OPTIONS:
   --help, -h              This help
   --build-dir, -b         Build directory
   --install-dir, -i       Install directory
-  --type, -t              Build type (release, debug, ... )
+  --build-type, -t        Build type (release, debug, ...)
   --wipe, -w              Wipe whole repo (except startup.* files)
 __EOF__
 }
@@ -75,10 +77,11 @@ done
 
 cmake \
   -G Ninja \
-  -S src \
+  -S ${src_dir}/src \
   -B ${build_dir} \
   -DCMAKE_PREFIX_PATH=${prefix_path} \
   -DCMAKE_INSTALL_PREFIX=${install_dir} \
+  -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
   -DCMAKE_BUILD_TYPE:STRING=${build_type}
 
   cat << __EOF__
@@ -88,7 +91,6 @@ cmake \
   ninja                   Build VPP
   ninja set-build-type-*  Change build type to <debug|release|gcov|...>
   ninja config            Start build configuration TUI
-  ninja compdb            Generate compile_commands.json
   ninja run               Runs VPP using startup.conf in the build directory
   ninja debug             Runs VPP inside GDB using startup.conf in the build directory
   ninja pkg-deb           Create .deb packages