diff --git a/README.md b/README.md index f5591b2fbbc..3974d029305 100644 --- a/README.md +++ b/README.md @@ -213,9 +213,9 @@ sudo dpkg -i /path/to/package.deb ``` The cmake command takes the following optional arguments to further customize the build (see file `CMakeLists.txt` for the full list): - - `-DCMAKE_BUILD_TYPE=RELEASE|DEBUG` -- set CMAKE_BUILD_TYPE to - RELEASE or DEBUG to build with optimizations or with debug - symbols to run in gdb. Default is RELEASE. + - `-DCMAKE_BUILD_TYPE=Release|Debug` -- set CMAKE_BUILD_TYPE to + Release or Debug to build with optimizations or with debug + symbols to run in gdb. Default is Release. - `-DCMAKE_INSTALL_PREFIX=` -- set the directory where `make install` installs the compiler. Defaults to /usr/local. - `-DENABLE_BMV2=ON|OFF`. Enable [the bmv2 backend](backends/bmv2/README.md). Default ON. diff --git a/bootstrap.sh b/bootstrap.sh index 475f34d32a9..3f6a87c5856 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -55,7 +55,7 @@ while [ $# -gt 0 ]; do --force) FORCE=true ;; - debug|release|relwithdebinfo|Debug|Release|RelWithDebInfo|DEBUG|RELEASE|RELWITHDEBINFO) + Debug|Release|RelWithDebInfo) BuildType="$1" ;; build*) diff --git a/tools/ci-build.sh b/tools/ci-build.sh index d5634e1b59b..40549580f2d 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -271,7 +271,7 @@ CMAKE_FLAGS+="-DSTATIC_BUILD_WITH_DYNAMIC_GLIBC=${STATIC_BUILD_WITH_DYNAMIC_GLIB CMAKE_FLAGS+="-DSTATIC_BUILD_WITH_DYNAMIC_STDLIB=${STATIC_BUILD_WITH_DYNAMIC_STDLIB} " # Enable GTest. CMAKE_FLAGS+="-DENABLE_GTESTS=${ENABLE_GTESTS} " -# RELEASE should be default, but we want to make sure. +# Release should be default, but we want to make sure. CMAKE_FLAGS+="-DCMAKE_BUILD_TYPE=Release " # Treat warnings as errors. CMAKE_FLAGS+="-DENABLE_WERROR=${ENABLE_WERROR} " diff --git a/tools/debian-build/packaging.conf b/tools/debian-build/packaging.conf index c4defeb356a..bb51cecb020 100644 --- a/tools/debian-build/packaging.conf +++ b/tools/debian-build/packaging.conf @@ -11,7 +11,7 @@ CONFOPT="" export CXXFLAGS="${CXXFLAGS} -O3" # Enable unity compilation. CONFOPT+="-DCMAKE_UNITY_BUILD=ON " -# RELEASE should be default, but we want to make sure. +# Release should be default, but we want to make sure. CONFOPT+="-DCMAKE_BUILD_TYPE=Release " # The binaries we produce should not depend on system libraries. CONFOPT+="-DSTATIC_BUILD_WITH_DYNAMIC_GLIBC=ON "