js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use module.modulemap instead of module.map

Browse source
This commit is contained in:
Jonathan Schleifer 2017-10-15 22:50:28 +02:00
parent b7dfe42375
commit fcd2b51d19
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
buildsys.mk.in
View file

@ -315,15 +315,24 @@ ${FRAMEWORK}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
rm -fr $$dir; \ rm -fr $$dir; \
done; \ done; \
${MAKE} includedir=$$PWD/$$out/Headers INSTALL_INCLUDES_IF_SUBDIR=${includesubdir} install-includes; \ ${MAKE} includedir=$$PWD/$$out/Headers INSTALL_INCLUDES_IF_SUBDIR=${includesubdir} install-includes; \
for i in Info.plist module.map; do \ if test -f Info.plist; then \
test -f $$i || continue; \ i=Info.plist; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${INSTALL} -m 644 $$i $$out/$$i; then \ if ${INSTALL} -m 644 $$i $$out/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi \ fi \
done 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}; \
else \
${INSTALL_FAILED}; \
fi \
fi
${MORPHOS_LIB} ${MORPHOS_LIB_NOINST}: ${EXT_DEPS} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA} ${MORPHOS_LIB} ${MORPHOS_LIB_NOINST}: ${EXT_DEPS} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}