Overview
| Comment: | Better way to set the assembler + flags.
Also checks for -no-integrated-as to avoid clang's integrated assembler, |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
af9448f6eda3fc018b741d407322ccf8 |
| User & Date: | js on 2012-11-26 23:15:53 |
| Other Links: | manifest | tags |
Context
|
2012-11-26
| ||
| 23:19 | Implement forwarding target for Apple/ARM. check-in: 5927b80b4e user: js tags: trunk | |
| 23:15 | Better way to set the assembler + flags. check-in: af9448f6ed user: js tags: trunk | |
|
2012-11-24
| ||
| 00:07 | -[OFSortedList addObject:] -> -[insertObject:]. check-in: 7a8a5a2995 user: js tags: trunk | |
Changes
Modified buildsys.mk.in from [b65e728a78] to [bae2b43312].
| ︙ | ︙ | |||
56 57 58 59 60 61 62 63 64 65 66 67 68 69 | LIB_SUFFIX = @LIB_SUFFIX@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ INSTALL_LIB = @INSTALL_LIB@ UNINSTALL_LIB = @UNINSTALL_LIB@ CLEAN_LIB = @CLEAN_LIB@ CC_DEPENDS = @CC_DEPENDS@ CXX_DEPENDS = @CXX_DEPENDS@ OBJC_DEPENDS = @OBJC_DEPENDS@ OBJCXX_DEPENDS = @OBJCXX_DEPENDS@ LN_S = @LN_S@ MKDIR_P = mkdir -p INSTALL = @INSTALL@ | > | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | LIB_SUFFIX = @LIB_SUFFIX@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ 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@ MKDIR_P = mkdir -p INSTALL = @INSTALL@ |
| ︙ | ︙ |
Modified configure.ac from [05952e452a] to [f33cdcae46].
| ︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
])
AX_CHECK_COMPILER_FLAGS(-Wshorten-64-to-32,
[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"])
AC_MSG_CHECKING(whether Objective C compiler supports properties)
AC_TRY_COMPILE([
@interface Foo
{
id bar;
}
| > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 |
])
AX_CHECK_COMPILER_FLAGS(-Wshorten-64-to-32,
[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
{
id bar;
}
|
| ︙ | ︙ | |||
740 741 742 743 744 745 746 747 748 749 750 751 752 753 | BUILDSYS_INIT BUILDSYS_TOUCH_DEPS 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) AC_CONFIG_FILES([ buildsys.mk extra.mk Info.plist utils/objfw-config src/bridge/Info.plist | > > > > | 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 | BUILDSYS_INIT BUILDSYS_TOUCH_DEPS 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 utils/objfw-config src/bridge/Info.plist |
| ︙ | ︙ |
Modified src/Makefile from [376a1026a7] to [7ad22e578d].
| ︙ | ︙ | |||
108 109 110 111 112 113 114 |
OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_A} ${RUNTIME_RUNTIME_A}
LIB_OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_LIB_A} ${RUNTIME_RUNTIME_LIB_A}
include ../buildsys.mk
CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
| < < < | 108 109 110 111 112 113 114 115 116 117 118 |
OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_A} ${RUNTIME_RUNTIME_A}
LIB_OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_LIB_A} ${RUNTIME_RUNTIME_LIB_A}
include ../buildsys.mk
CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
LD = ${OBJC}
LDFLAGS += ${REEXPORT_LIBOBJC}
${BRIDGE}: ${SHARED_LIB}
|
Modified src/runtime/Makefile from [a2f274f2c0] to [6581fa5019].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 |
synchronized.m \
threading.m
INCLUDES = runtime.h
include ../../buildsys.mk
CPPFLAGS += -I. -I.. -I../..
| < < < | 19 20 21 22 23 24 25 26 |
synchronized.m \
threading.m
INCLUDES = runtime.h
include ../../buildsys.mk
CPPFLAGS += -I. -I.. -I../..
LD = ${OBJC}
|