summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Schleifer <js@heap.zone>2018-03-11 00:06:17 +0100
committerJonathan Schleifer <js@heap.zone>2018-03-11 00:06:17 +0100
commita44616d977620e6f0e4ac3b4107cc45ab39d5bd7 (patch)
tree38c0cdffd81c8b59adaa9fd14e7952135ef87107
parent43a9c146228fa54795baaebdabed422cec0e294e (diff)
Use OBJCXXFLAGS to generate deps for .mm
-rw-r--r--buildsys.mk.in2
-rw-r--r--m4/buildsys.m44
2 files changed, 3 insertions, 3 deletions
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}'