diff --git a/configs/config-android.cmake b/configs/config-android.cmake
index bf49835541a56f576b88ff42c0a76e97593df079..17e3a618e82548c4d1522c3a9a22acc467a4dcef 100644
--- a/configs/config-android.cmake
+++ b/configs/config-android.cmake
@@ -89,7 +89,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
-lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_MSG_STORAGE=YES")
@@ -110,7 +109,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_GLX=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_V4L=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_X11=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO")
-lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(ms2 "-DENABLE_DOC=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
 lcb_builder_linking_type(ms2 "-DENABLE_STATIC=NO" "-DENABLE_SHARED=YES")
diff --git a/configs/config-bb10.cmake b/configs/config-bb10.cmake
index 212f6f3c1afe7e444368fbd439e7a55022080e8a..ae071a3164c3a5099256e858f10f29a6aeca8837 100644
--- a/configs/config-bb10.cmake
+++ b/configs/config-bb10.cmake
@@ -61,7 +61,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
-lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
@@ -84,7 +83,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_MKV=YES")
 lcb_builder_cmake_options(ms2 "-DENABLE_QNX=YES")
 lcb_builder_cmake_options(ms2 "-DENABLE_V4L=NO")
-lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
 
 # vpx
diff --git a/configs/config-ios.cmake b/configs/config-ios.cmake
index b6ac6438d9f3c3fa285d666edbed7ac99091df7c..f538356b5897e1f69274c7485d44ecd2f6d37cb6 100644
--- a/configs/config-ios.cmake
+++ b/configs/config-ios.cmake
@@ -63,8 +63,8 @@ if(NOT ${XCODE_VERSION} VERSION_LESS 7)
 	endif()
 endif()
 
-set(LINPHONE_BUILDER_CXXFLAGS "-stdlib=libc++")
-set(LINPHONE_BUILDER_LDFLAGS "-stdlib=libc++")
+set(LINPHONE_BUILDER_CXXFLAGS "${LINPHONE_BUILDER_CXXFLAGS} -stdlib=libc++")
+set(LINPHONE_BUILDER_LDFLAGS "${LINPHONE_BUILDER_LDFLAGS} -stdlib=libc++")
 
 # Include builders
 include(builders/CMakeLists.txt)
@@ -84,7 +84,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_MSG_STORAGE=YES")
 lcb_builder_cmake_options(linphone "-DENABLE_DOC=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_NLS=NO")
-lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 
 # mbedtls
 lcb_builder_linking_type(mbedtls "-DUSE_STATIC_MBEDTLS_LIBRARY=YES" "-DUSE_SHARED_MBEDTLS_LIBRARY=NO")
@@ -98,7 +97,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_GLX=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_X11=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_DOC=NO")
-lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 
 # opus
 lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
diff --git a/configs/config-python.cmake b/configs/config-python.cmake
index ea0fe0eb0af3f1b9542f1ea101a9224d2dec975c..4a58a22442582d92be136e1563ba28af2cb195f8 100644
--- a/configs/config-python.cmake
+++ b/configs/config-python.cmake
@@ -89,7 +89,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
-lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
@@ -100,7 +99,6 @@ lcb_builder_linking_type(mbedtls "-DUSE_STATIC_MBEDTLS_LIBRARY=YES" "-DUSE_SHARE
 # ms2
 lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
-lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(ms2 "-DENABLE_PCAP=NO")
 if(UNIX AND NOT APPLE)
 	lcb_builder_cmake_options(ms2 "-DENABLE_ALSA=YES")
diff --git a/configs/config-webplugin.cmake b/configs/config-webplugin.cmake
index aef1116a1cc8749d10671e6a9478a4144ba56a60..e5258708cc3a50d2c88d326d41ab8a8634591a51 100644
--- a/configs/config-webplugin.cmake
+++ b/configs/config-webplugin.cmake
@@ -74,7 +74,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
-lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
@@ -88,7 +87,6 @@ endif()
 # mediastreamer2
 lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
-lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 if(UNIX AND NOT APPLE)
 	lcb_builder_cmake_options(ms2 "-DENABLE_ALSA=YES")
 	lcb_builder_cmake_options(ms2 "-DENABLE_PULSEAUDIO=NO")
diff --git a/configs/config-win10.cmake b/configs/config-win10.cmake
index 991775dbf2e4f484b48e547d54231ccc22d0f5e2..704800e52d6ffac481d6a5ae8ab6d3d6a2823147 100644
--- a/configs/config-win10.cmake
+++ b/configs/config-win10.cmake
@@ -59,13 +59,11 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
-lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
 
 # ms2
 lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
-lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 
 # opus
 lcb_builder_cmake_options(opus "-DENABLE_ASM=NO")
diff --git a/configs/config-windowsphone.cmake b/configs/config-windowsphone.cmake
index 62c5b39521fc3184b4c6c2c72f50e5c87557ce8d..6b18f8b9ed4d432f0d646f0a039bb53a8861dcdc 100644
--- a/configs/config-windowsphone.cmake
+++ b/configs/config-windowsphone.cmake
@@ -45,7 +45,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
-lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO")
 lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
@@ -53,7 +52,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
 # ms2
 lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
 lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
-lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
 
 # vpx
 set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")