diff --git a/buildroot/build-portable.sh b/buildroot/build-portable.sh
index 3398c79f..e337c980 100755
--- a/buildroot/build-portable.sh
+++ b/buildroot/build-portable.sh
@@ -303,7 +303,8 @@ BuildArch()
     rm ${AIR_ARCH_ROOT}/CMakeCache.txt
   fi
 
-  cmake -DCMAKE_TOOLCHAIN_FILE="${BR_ARCH_PATH}/output/host/usr/share/buildroot/toolchainfile.cmake" -DBUILD_SHARED_LIBS=OFF -DSTRIP=ON -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${AIR_ARCH_ROOT}
+  # Define the CMAKE_CXX_FLAGS variable so that we won't get any defaults from the toolchain file
+  cmake -DCMAKE_TOOLCHAIN_FILE="${BR_ARCH_PATH}/output/host/usr/share/buildroot/toolchainfile.cmake" -DSTRIP=ON -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -g -DNDEBUG" -DCMAKE_CXX_FLAGS="" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${AIR_ARCH_ROOT}
 
   make -j${BUILD_THREADS}
 
diff --git a/buildroot/config/.config b/buildroot/config/.config
index b3448044..53278a20 100644
--- a/buildroot/config/.config
+++ b/buildroot/config/.config
@@ -395,7 +395,10 @@ BR2_LUAROCKS_MIRROR="http://rocks.moonscript.org"
 BR2_CPAN_MIRROR="http://cpan.metacpan.org"
 BR2_JLEVEL=0
 # BR2_CCACHE is not set
-# BR2_ENABLE_DEBUG is not set
+BR2_ENABLE_DEBUG=y
+# BR2_DEBUG_1 is not set
+BR2_DEBUG_2=y
+# BR2_DEBUG_3 is not set
 # BR2_ENABLE_RUNTIME_DEBUG is not set
 # BR2_STRIP_strip is not set
 # BR2_OPTIMIZE_0 is not set