Overview
| Comment: | Use FRAMEWORK_LIBS instead of LIBS for .frameworks
This allows linking the framework against other frameworks rather than |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
72ce4372e0fd3c6ff0f0ac46e303021b |
| User & Date: | js on 2018-01-21 21:45:44 |
| Other Links: | manifest | tags |
Context
|
2018-02-07
| ||
| 20:14 | Small cleanup check-in: 38d3be8fbf user: js tags: trunk | |
|
2018-01-21
| ||
| 21:45 | Use FRAMEWORK_LIBS instead of LIBS for .frameworks check-in: 72ce4372e0 user: js tags: trunk | |
| 19:00 | Allow BUILDSYS_FRAMEWORK to take a code block check-in: 6e4a40f731 user: js tags: trunk | |
Changes
Modified buildsys.mk.in from [22fedc8558] to [92feb15db4].
| ︙ | ︙ | |||
273 274 275 276 277 278 279 |
${INSTALL_OK}; \
else \
${INSTALL_FAILED}; \
fi \
fi
${LINK_STATUS}
out="$@"; \
| | | 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 |
${INSTALL_OK}; \
else \
${INSTALL_FAILED}; \
fi \
fi
${LINK_STATUS}
out="$@"; \
if ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \
${LINK_OK}; \
else \
rm -fr $$out; \
${LINK_FAILED}; \
fi
${MORPHOS_LIB} ${MORPHOS_LIB_NOINST}: ${EXT_DEPS} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA}
|
| ︙ | ︙ |
Modified m4/buildsys.m4 from [9e4857b7b5] to [037e222758].
| ︙ | ︙ | |||
140 141 142 143 144 145 146 147 148 149 150 151 152 153 |
AC_SUBST(PROG_IMPLIB_NEEDED)
AC_SUBST(PROG_IMPLIB_LDFLAGS)
])
AC_DEFUN([BUILDSYS_SHARED_LIB], [
AC_REQUIRE([AC_CANONICAL_HOST])
AC_MSG_CHECKING(for shared library system)
case "$host_os" in
darwin*)
AC_MSG_RESULT(Darwin)
LIB_CFLAGS='-fPIC -DPIC'
LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
LIB_PREFIX='lib'
| > | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 |
AC_SUBST(PROG_IMPLIB_NEEDED)
AC_SUBST(PROG_IMPLIB_LDFLAGS)
])
AC_DEFUN([BUILDSYS_SHARED_LIB], [
AC_REQUIRE([AC_CANONICAL_HOST])
AC_MSG_CHECKING(for shared library system)
case "$host_os" in
darwin*)
AC_MSG_RESULT(Darwin)
LIB_CFLAGS='-fPIC -DPIC'
LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
LIB_PREFIX='lib'
|
| ︙ | ︙ | |||
279 280 281 282 283 284 285 |
FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
])
AC_SUBST(FRAMEWORK_LDFLAGS)
AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
$1
| < | 280 281 282 283 284 285 286 287 288 289 |
FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
])
AC_SUBST(FRAMEWORK_LDFLAGS)
AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
$1
;;
esac
])
|