Index: buildsys.mk.in
==================================================================
--- buildsys.mk.in
+++ buildsys.mk.in
@@ -204,11 +204,11 @@
 	${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \
 	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \
 	{ rm -f $@; false; }
 
 .mm.mm.dep:
-	${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \
+	${CPP} ${CPPFLAGS} ${OBJCXXFLAGS} -M $< | \
 	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \
 	{ rm -f $@; false; }
 
 .S.S.dep:
 	${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \

Index: m4/buildsys.m4
==================================================================
--- m4/buildsys.m4
+++ m4/buildsys.m4
@@ -295,14 +295,14 @@
 AC_DEFUN([BUILDSYS_FRAMEWORK], [
 	AC_REQUIRE([AC_CANONICAL_HOST])
 	AC_REQUIRE([BUILDSYS_CHECK_IOS])
 	AC_REQUIRE([BUILDSYS_SHARED_LIB])
 
-	AC_CHECK_TOOL(CODESIGN, codesign)
-
 	case "$host_os" in
 		darwin*)
+			AC_CHECK_TOOL(CODESIGN, codesign)
+
 			AS_IF([test x"$host_is_ios" = x"yes"], [
 				FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
 				FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}'
 			], [
 				FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'