Index: buildsys.mk.in ================================================================== --- buildsys.mk.in +++ buildsys.mk.in @@ -58,10 +58,11 @@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ INSTALL_LIB = @INSTALL_LIB@ UNINSTALL_LIB = @UNINSTALL_LIB@ CLEAN_LIB = @CLEAN_LIB@ +AS_DEPENDS = @AS_DEPENDS@ CC_DEPENDS = @CC_DEPENDS@ CXX_DEPENDS = @CXX_DEPENDS@ OBJC_DEPENDS = @OBJC_DEPENDS@ OBJCXX_DEPENDS = @OBJCXX_DEPENDS@ LN_S = @LN_S@ Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -41,10 +41,12 @@ [OBJCFLAGS="$OBJCFLAGS -Wshorten-64-to-32"]) AX_CHECK_COMPILER_FLAGS(-Wsemicolon-before-method-body, [OBJCFLAGS="$OBJCFLAGS -Wsemicolon-before-method-body"]) AX_CHECK_COMPILER_FLAGS(-Wno-objc-root-class, [OBJCFLAGS="$OBJCFLAGS -Wno-objc-root-class"]) +AX_CHECK_COMPILER_FLAGS([-no-integrated-as], + [ASFLAGS="$ASFLAGS -no-integrated-as"]) AC_MSG_CHECKING(whether Objective C compiler supports properties) AC_TRY_COMPILE([ @interface Foo { @@ -742,10 +744,14 @@ dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself. AC_SUBST(CPP) AC_SUBST(CPPFLAGS) +dnl We use the OBJC compiler as our assembler +AC_SUBST(AS, $OBJC) +AC_SUBST(ASFLAGS) +AC_SUBST(AS_DEPENDS, $OBJC_DEPENDS) AC_CONFIG_FILES([ buildsys.mk extra.mk Info.plist Index: src/Makefile ================================================================== --- src/Makefile +++ src/Makefile @@ -110,12 +110,9 @@ LIB_OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_LIB_A} ${RUNTIME_RUNTIME_LIB_A} include ../buildsys.mk CPPFLAGS += -I. -I.. -Iexceptions -Iruntime -AS = ${OBJC} -ASFLAGS = ${CPPFLAGS} -AS_DEPENDS = ${OBJC_DEPENDS} LD = ${OBJC} LDFLAGS += ${REEXPORT_LIBOBJC} ${BRIDGE}: ${SHARED_LIB} Index: src/runtime/Makefile ================================================================== --- src/runtime/Makefile +++ src/runtime/Makefile @@ -21,9 +21,6 @@ INCLUDES = runtime.h include ../../buildsys.mk CPPFLAGS += -I. -I.. -I../.. -AS = ${OBJC} -ASFLAGS = ${CPPFLAGS} -AS_DEPENDS = ${OBJC_DEPENDS} LD = ${OBJC}