diff --git a/buildsys.mk.in b/buildsys.mk.in
index ff766aa..f006111 100644
--- a/buildsys.mk.in
+++ b/buildsys.mk.in
@@ -206,7 +206,7 @@ depend: pre-depend ${SRCS}
 	{ 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; }
 
diff --git a/m4/buildsys.m4 b/m4/buildsys.m4
index 8b1f361..1841ef3 100644
--- a/m4/buildsys.m4
+++ b/m4/buildsys.m4
@@ -297,10 +297,10 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [
 	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}'