diff --git a/src/actions.make b/src/actions.make
index 66c19b0..59750d3 100644
--- a/src/actions.make
+++ b/src/actions.make
@@ -39,19 +39,19 @@ compile_kobo: ../build/stb.arm.o libfbink
 compile_kobo: export CPP_FLAGS += -O2 -static -static-libstdc++ -static-libgcc
 compile_kobo: export OKP_FLAGS += ../build/stb.arm.o
 compile_kobo:
-	CXX=${CXX_BIN} okp ${OKP_FLAGS} -- -D"KOBO=1" -D${RMKIT_IMPL} ${CPP_FLAGS}
+	CXX="${CXX_BIN}" okp ${OKP_FLAGS} -- -D"KOBO=1" -D${RMKIT_IMPL} ${CPP_FLAGS}
 
 compile_remarkable: ../build/stb.arm.o libfbink
 compile_remarkable: export CPP_FLAGS += -O2
 compile_remarkable: export OKP_FLAGS += ../build/stb.arm.o
 compile_remarkable:
-	CXX=${CXX_BIN} okp ${OKP_FLAGS} -- -D"REMARKABLE=1" -D${RMKIT_IMPL} ${CPP_FLAGS}
+	CXX="${CXX_BIN}" okp ${OKP_FLAGS} -- -D"REMARKABLE=1" -D${RMKIT_IMPL} ${CPP_FLAGS}
 
 compile_remarkable_fast: ../build/stb.arm.o
 compile_remarkable_fast: export CPP_FLAGS += -O0 -g
 compile_remarkable_fast: export OKP_FLAGS += ../build/stb.arm.o
 compile_remarkable_fast:
-	CXX=${CXX_BIN} okp ${OKP_FLAGS} -- -D"REMARKABLE=1" -D${RMKIT_IMPL} ${CPP_FLAGS}
+	CXX="${CXX_BIN}" okp ${OKP_FLAGS} -- -D"REMARKABLE=1" -D${RMKIT_IMPL} ${CPP_FLAGS}
 
 compile_dev: ../build/stb.x86.o
 compile_dev: export CPP_FLAGS += -O0 -g
diff --git a/src/common.make b/src/common.make
index 96e6228..d0a3b06 100644
--- a/src/common.make
+++ b/src/common.make
@@ -3,6 +3,7 @@ TARGET?=rm
 CROSS_TC?=arm-linux-gnueabihf
 CXX_BIN?=${CROSS_TC}-g++
 CC_BIN?=${CROSS_TC}-gcc
+CXX_BIN?=${CXX}
 STRIP_BIN?=${CROSS_TC}-strip
 CPP_FLAGS=-ldl -pthread -lpthread -fdata-sections -ffunction-sections -Wl,--gc-sections