Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
hs-test: change convention for skipping tests
[vpp.git]
/
configure
diff --git
a/configure
b/configure
index
d1a356e
..
7db7726
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-5,12
+5,14
@@
set -o pipefail -o errtrace -o nounset -o errexit
# submitting any changes
# defaults
# submitting any changes
# defaults
+platform=default
build_dir=.
install_dir=/usr/local
build_type=release
src_dir="$(dirname "$(readlink -f "$0")")"
host_arch=$(uname -m)
arch=${host_arch}
build_dir=.
install_dir=/usr/local
build_type=release
src_dir="$(dirname "$(readlink -f "$0")")"
host_arch=$(uname -m)
arch=${host_arch}
+native_only=no
wipe=no
args=()
wipe=no
args=()
@@
-27,7
+29,10
@@
OPTIONS:
--build-dir, -b Build directory
--install-dir, -i Install directory
--build-type, -t Build type (release, debug, ...)
--build-dir, -b Build directory
--install-dir, -i Install directory
--build-type, -t Build type (release, debug, ...)
+ --native-only, -n Only compile for Native CPU (no multiarch)
--wipe, -w Wipe whole repo (except startup.* files)
--wipe, -w Wipe whole repo (except startup.* files)
+ --sanitize, -s Enable sanitizer (mem)
+ --platform, -p Specify target platform
__EOF__
}
__EOF__
}
@@
-73,10
+78,32
@@
while (( "$#" )); do
exit 1
fi
;;
exit 1
fi
;;
+ -p|--platform)
+ if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+ platform=$2
+ shift 2
+ else
+ echo "Error: Argument for $1 is missing" >&2
+ exit 1
+ fi
+ ;;
+ -n|--native-only)
+ native_only=yes
+ shift 1
+ ;;
-w|--wipe)
wipe=yes
shift 1
;;
-w|--wipe)
wipe=yes
shift 1
;;
+ -s|--sanitize)
+ shift 1
+ case "$1" in
+ mem)
+ shift 1
+ args+=("-DVPP_ENABLE_SANITIZE_ADDR=ON")
+ ;;
+ esac
+ ;;
-*|--*=) # unsupported flags
echo "Error: Unsupported flag $1" >&2
exit 1
-*|--*=) # unsupported flags
echo "Error: Unsupported flag $1" >&2
exit 1
@@
-105,6
+132,8
@@
args+=("-DCMAKE_PREFIX_PATH=/opt/vpp/external/${arch}")
args+=("-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON")
args+=("-DCMAKE_INSTALL_PREFIX=${install_dir}")
args+=("-DCMAKE_BUILD_TYPE:STRING=${build_type}")
args+=("-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON")
args+=("-DCMAKE_INSTALL_PREFIX=${install_dir}")
args+=("-DCMAKE_BUILD_TYPE:STRING=${build_type}")
+args+=("-DVPP_PLATFORM=${platform}")
+[ "${native_only}" == "yes" ] && args+=("-DVPP_BUILD_NATIVE_ONLY:BOOL=ON")
[ "${wipe}" == "yes" ] && git clean -fdx --exclude=startup.\*
[ "${wipe}" == "yes" ] && git clean -fdx --exclude=startup.\*