Index: configure
===================================================================
--- configure	(revision 42198)
+++ configure	(working copy)
@@ -126,9 +126,9 @@
 _plugins_default=static
 _nasm=auto
 # Default commands
-_ranlib=ranlib
-_strip=strip
-_ar="ar cru"
+_ranlib=${RANLIB:-ranlib}
+_strip=${STRIP:-strip}
+_ar="${AR:-ar} cru"
 _windres=windres
 _win32path="C:/scummvm"
 _aos4path="Games:ScummVM"
@@ -619,6 +619,12 @@
   CXXFLAGS  C++ compiler flags
   CPPFLAGS  C++ preprocessor flags, e.g. -I<include dir> if you have
             headers in a nonstandard directory <include dir>
+  OBJC      Objective-C compiler command
+  OBJCFLAGS Objective-C compiler flags
+  AS        Assembler command
+  AR        Library archive command
+  RANLIB    Library archive TOC command
+  STRIP     Binary stripping command
 
 EOF
 		exit 0
@@ -1280,9 +1286,6 @@
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
 			_backend="iphone"
 			_build_hq_scalers="no"
-			_ar="$_host_alias-ar cru"
-			_ranlib=$_host_alias-ranlib
-			_strip=$_host_alias-strip
 			;;
 		dreamcast)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
@@ -2109,6 +2112,7 @@
 
 CXX := $CXX
 CXXFLAGS := $CXXFLAGS
+OBJCFLAGS := $OBJCFLAGS
 LIBS += $LIBS
 RANLIB := $_ranlib
 STRIP := $_strip
@@ -2122,6 +2126,8 @@
 MODULES += $MODULES
 MODULE_DIRS += $MODULE_DIRS
 EXEEXT := $HOSTEXEEXT
+AS := $AS
+ASFLAGS := $ASFLAGS
 NASM := $NASM
 NASMFLAGS := $NASMFLAGS
 
Index: Makefile.common
===================================================================
--- Makefile.common	(revision 42198)
+++ Makefile.common	(working copy)
@@ -98,7 +98,7 @@
 	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 %.o: %.m
 	$(MKDIR) $(*D)/$(DEPDIR)
-	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(OBJCFLAGS) -c $(<) -o $*.o
+	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(OBJCFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 endif
 
 ifdef HAVE_NASM