buildsys  Check-in [b4d7f6b2a0]

Overview
Comment:Use module.modulemap instead of module.map
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b4d7f6b2a0cfb2c5751dc8f9759ceb7a6179e359e8ee7539b52d1f45a4f78197
User & Date: js on 2017-10-15 20:50:28
Other Links: manifest | tags
Context
2017-10-16
22:48
Fix copying .framework headers into wrong dir check-in: cea80baf39 user: js tags: trunk
2017-10-15
20:50
Use module.modulemap instead of module.map check-in: b4d7f6b2a0 user: js tags: trunk
20:22
Do not use LIB_LDFLAGS for .frameworks check-in: bdf6dfeb42 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified buildsys.mk.in from [45df8377b9] to [52e0238951].

︙
311
312
313
314
315
316
317
318
319


320
321
322
323
324
325






326




327
328
329
330
331
332
333

311
312
313
314
315
316
317


318
319
320
321
322
323
324
325
326
327
328
329
330
331

332
333
334
335
336
337
338
339
340
341
342








-
-
+
+






+
+
+
+
+
+
-
+
+
+
+








		${LINK_FAILED}; \
	fi; \
	for i in $$ars; do \
		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
		rm -fr $$dir; \
	done; \
	${MAKE} includedir=$$PWD/$$out/Headers INSTALL_INCLUDES_IF_SUBDIR=${includesubdir} install-includes; \
	for i in Info.plist module.map; do \
		test -f $$i || continue; \
	if test -f Info.plist; then \
		i=Info.plist; \
		${INSTALL_STATUS}; \
		if ${INSTALL} -m 644 $$i $$out/$$i; then \
			${INSTALL_OK}; \
		else \
			${INSTALL_FAILED}; \
		fi \
	fi; \
	if test -f module.modulemap; then \
		i=module.modulemap; \
		${INSTALL_STATUS}; \
		if ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 $$i $$out/Modules/$$i; then \
			${INSTALL_OK}; \
	done
		else \
			${INSTALL_FAILED}; \
		fi \
	fi

${MORPHOS_LIB} ${MORPHOS_LIB_NOINST}: ${EXT_DEPS} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA}
	${LINK_STATUS}
	out="$@"; \
	objs=""; \
	ars=""; \
	for i in ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA}; do \
︙