diff --git a/.gitmodules b/.gitmodules
index 51e2a2f..6d978a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "third_party/farmhash"]
 	path = third_party/farmhash
 	url = https://github.com/google/farmhash
+[submodule "farmhash"]
+	path = farmhash
+	url = https://github.com/google/farmhash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed1b6f8..e39cddb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 cmake_minimum_required (VERSION 3.2)
-project (cpu_check VERSION 20181130 LANGUAGES C CXX)
 
 # Options
 # Use clang/llvm by default.
@@ -25,6 +24,20 @@ if (NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release)
 endif(NOT CMAKE_BUILD_TYPE)
 
+if (USE_CLANG)
+        set(CMAKE_C_COMPILER clang)
+        set(CMAKE_CXX_COMPILER clang++)
+        set(CC clang)
+        set(CXX clang++)
+endif(USE_CLANG)
+
+if (BUILD_STATIC)
+        set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+	set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
+endif(BUILD_STATIC)
+
+project (cpu_check VERSION 20181130 LANGUAGES C CXX)
+
 
 # Begin Google local change
 
@@ -56,13 +69,6 @@ configure_file (
 )
 include_directories("${PROJECT_BINARY_DIR}")
 
-if (USE_CLANG)
-	set(CMAKE_C_COMPILER clang)
-	set(CMAKE_CXX_COMPILER clang++)
-	set(CC clang)
-	set(CXX clang++)
-endif(USE_CLANG)
-
 set(CMAKE_C_FLAGS_DEBUG "-g -Wall -O0")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -O0")
 set(CMAKE_C_FLAGS_RELEASE "-Wall -O2")
@@ -110,10 +116,6 @@ target_link_libraries(cpu_check fvt_controller ${VENDORS_LIBS} utils)
 # End Google local change
 target_link_libraries(crc32c_test crc32c)
 
-if (BUILD_STATIC)
-	set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-endif(BUILD_STATIC)
-
 # Needs pthreads
 find_package(Threads REQUIRED)
 target_link_libraries(cpu_check Threads::Threads)
diff --git a/farmhash b/farmhash
new file mode 160000
index 0000000..0d859a8
--- /dev/null
+++ b/farmhash
@@ -0,0 +1 @@
+Subproject commit 0d859a811870d10f53a594927d0d0b97573ad06d