diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 67b410fc..980d50c9 100644
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -14,27 +14,27 @@ fi
 
 echo "Compiler: $COMPILER"
 
-platformvar=armv
+export ARMPLATFORM=$ARMPLATFORM-armv
 
 if [ "$ARM_NEON" ]; then
 echo "=== ARM NEON opts enabled... ==="
-platformvar += -neon
+export ARMPLATFORM = $ARMPLATFORM-neon
 fi
 if [ "$CORTEX_A8" ]; then
 echo "=== Cortex A8 opts enabled... ==="
-platformvar += -cortexa8
+export ARMPLATFORM = $ARMPLATFORM-cortexa8
 fi
 if [ "$CORTEX_A9" ]; then
 echo "=== Cortex A9 opts enabled... ==="
-platformvar += -cortexa9
+export ARMPLATFORM = $ARMPLATFORM-cortexa9
 fi
 if [ "$ARM_HARDFLOAT" ]; then
 echo "=== ARM hardfloat ABI enabled... ==="
-platformvar += -hardfloat
+ARMPLATFORM = $ARMPLATFORM-hardfloat
 fi
 if [ "$ARM_SOFTFLOAT" ]; then
 echo "=== ARM softfloat ABI enabled... ==="
-platformvar += -softfloat
+ARMPLATFORM += ARMPLATFORM-softfloat
 fi
 
 build_libretro_fba_full()
@@ -508,8 +508,8 @@ build_libretro_picodrive()
       cd libretro-picodrive
       if [ "$ARMV7" = true ]; then
          echo "=== Building Picodrive (ARMv7) ==="
-         ${MAKE} -f Makefile.libretro platform=$platformvar -j$JOBS clean || die "Failed to clean Picodrive"
-         ${MAKE} -f Makefile.libretro platform=$platformvar -j$JOBS || die "Failed to build Picodrive"
+         ${MAKE} -f Makefile.libretro platform=$ARMPLATFORM -j$JOBS clean || die "Failed to clean Picodrive"
+         ${MAKE} -f Makefile.libretro platform=$ARMPLATFORM -j$JOBS || die "Failed to build Picodrive"
       else
          ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS clean || die "Failed to clean Picodrive"
          ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS || die "Failed to build PCSX Picodrive"
diff --git a/libretro-config.sh b/libretro-config.sh
index ee0c54ad..f5bd8f4b 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -21,6 +21,7 @@ fi
 
 #ARM DEFINES
 #-----------
+export ARMPLATFORM=
 
 #if uncommented, will build cores with Cortex A8 compiler optimizations
 #export CORTEX_A8