diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50901ee..8c79940 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ option(TILE_WITH_OPENSSL "Build with openssl" OFF)
 option(TILE_BUILD_SHARED "Build shared library" ON)
 option(TILE_BUILD_STATIC "Build static library" ON)
 
-if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_PROJECT_DIR)
+if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
   set(TILE_BUILD_TESTS ON)
   set(TILE_BUILD_BENCHMARKS ON)
 endif()
diff --git a/toolchains/host.gcc-m32.toolchain.cmake b/toolchains/host.gcc-m32.toolchain.cmake
index 5b2abd1..d646167 100644
--- a/toolchains/host.gcc-m32.toolchain.cmake
+++ b/toolchains/host.gcc-m32.toolchain.cmake
@@ -10,7 +10,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 set(CMAKE_C_FLAGS "-m32")
 set(CMAKE_CXX_FLAGS "-m32")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -m32")
 
 # cache flags
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" CACHE STRING "c flags")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING "c++ flags")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS}" CACHE STRING "asm flags")