diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 922399b7..6cedc05a 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -110,6 +110,7 @@ build_libretro_generic_makefile() {
       if [ -z "${NOCLEAN}" ]; then
          "${MAKE}" -f ${3} platform="${4}" ${COMPILER} "-j${JOBS}" clean || die "Failed to build ${1}"
       fi
+      echo "${MAKE}" -f ${3} platform="${4}" ${COMPILER} "-j${JOBS}"
       "${MAKE}" -f ${3} platform="${4}" ${COMPILER} "-j${JOBS}" || die "Failed to build ${1}"
       cp "${1}_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
    else
@@ -270,6 +271,7 @@ build_libretro_meteor() {
 }
 
 build_libretro_nestopia() {
+   echo command build_libretro_generic_makefile "nestopia" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
    build_libretro_generic_makefile "nestopia" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
 }
 
diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 5df6468a..6cd7772b 100644
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -127,6 +127,9 @@ echo "STRIP = $STRIP"
 echo "COMPILER = $COMPILER"
 echo
 
+export CC=$CC
+export CXX=$CXX
+
 RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET
 RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT
 
@@ -187,10 +190,10 @@ build_libretro_generic_makefile() {
     if [ -z "${ARGS}" ]
     then
         echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS}"
-        ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS}
+        ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
     else
         echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} ${ARGS}"
-        ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} ${ARGS}
+        ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}
     fi
 
     if [ $? -eq 0 ];