diff --git a/CMakeLists.txt b/CMakeLists.txt
index 994b486e9..e90d718d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,11 +94,6 @@ if (PLATFORM_WIN)
   )
 endif()
 
-# Try fast native arch.
-if (PLATFORM_LINUX)
-  add_compile_options(-march=native)
-endif()
-
 # Built-in CMake configurations: Debug, Release, RelWithDebInfo, MinSizeRel
 if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
   add_definitions(-DDEBUG)
@@ -264,6 +259,10 @@ if (PLATFORM_DESKTOP)
     add_subdirectory(qt)
     omim_add_tool_subdirectory(skin_generator)
   endif()
+  if (GENERATOR_TOOL)
+    add_compile_options(-march=native -mtune=native)
+    message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU")
+  endif()
   add_subdirectory(dev_sandbox)
 endif()
 
diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh
index 52f8e305b..68e2397a2 100755
--- a/tools/unix/build_omim.sh
+++ b/tools/unix/build_omim.sh
@@ -58,7 +58,7 @@ done
 OPT_TARGET=${@:$OPTIND}
 
 CMAKE_CONFIG="${CMAKE_CONFIG:-} -U SKIP_QT_GUI"
-if [ "$OPT_TARGET" != "desktop" -a -z "$OPT_DESIGNER" -a -z "$OPT_STANDALONE" ]; then
+if [ "$OPT_TARGET" != "desktop" -a -z "$OPT_DESIGNER" -a -z "$OPT_STANDALONE"] || [[ "$OPT_TARGET" =~ "generator_tool|topography_generator_tool|world_roads_builder_tool|mwm_diff_tool" ]]; then
   CMAKE_CONFIG="${CMAKE_CONFIG:-} -DSKIP_QT_GUI=ON"
 fi
 
@@ -68,6 +68,10 @@ if [ -z "$OPT_DEBUG$OPT_RELEASE$OPT_RELEASEDEBUGINFO" ]; then
   OPT_RELEASEDEBUGINFO=1
 fi
 
+if [[ "$OPT_TARGET" =~ "generator_tool|topography_generator_tool|world_roads_builder_tool|mwm_diff_tool" ]]; then
+  CMAKE_CONFIG="${CMAKE_CONFIG:-} -DGENERATOR_TOOL=ON"
+fi
+
 OMIM_PATH="$(cd "${OMIM_PATH:-$(dirname "$0")/../..}"; pwd)"
 if ! grep "DEFAULT_URLS_JSON" "$OMIM_PATH/private.h" >/dev/null 2>/dev/null; then
   echo "Please run $OMIM_PATH/configure.sh"