Skip to content

Commit

Permalink
Honor libr.dylib on ios-sdk.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
radare committed May 21, 2018
1 parent b4b3563 commit 8bab020
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BUILDSEC=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+__%H:%M:%S" 2>/dev/null ||
else
BUILDSEC=$(shell date "+__%H:%M:%S")
endif
DATADIRS=libr/cons/d libr/bin/d libr/asm/d libr/syscall/d libr/magic/d libr/anal/d
DATADIRS=libr/cons/d libr/flag/d libr/bin/d libr/asm/d libr/syscall/d libr/magic/d libr/anal/d
USE_ZIP=YES
ZIP=zip

Expand Down Expand Up @@ -210,7 +210,7 @@ install-doc-symlink:
ln -fs "$(PWD)/doc/$$FILE" "${DESTDIR}${DOCDIR}" ; done

install love: install-doc install-man install-www
cd libr && ${MAKE} install PARENT=1
cd libr && ${MAKE} install
cd binr && ${MAKE} install
cd shlr && ${MAKE} install
for DIR in ${DATADIRS} ; do \
Expand Down Expand Up @@ -279,11 +279,11 @@ symstall install-symlink: install-man-symlink install-doc-symlink install-pkgcon
deinstall uninstall:
rm -f $(DESTDIR)$(BINDIR)/r2-indent
rm -f $(DESTDIR)$(BINDIR)/r2-docker
cd libr && ${MAKE} uninstall PARENT=1
cd binr && ${MAKE} uninstall PARENT=1
cd shlr && ${MAKE} uninstall PARENT=1
cd libr/syscall/d && ${MAKE} uninstall PARENT=1
cd libr/anal/d && ${MAKE} uninstall PARENT=1
cd libr && ${MAKE} uninstall
cd binr && ${MAKE} uninstall
cd shlr && ${MAKE} uninstall
cd libr/syscall/d && ${MAKE} uninstall
cd libr/anal/d && ${MAKE} uninstall
@echo
@echo "Run 'make purge' to also remove installed files from previous versions of r2"
@echo
Expand Down
5 changes: 1 addition & 4 deletions libr/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ install: install-includes install-pkgconfig
# TODO :Use INSTALL_DATA_DIR instead of mkdir
# libraries
@${INSTALL_DIR} "${DESTDIR}${LIBDIR}"
@$(foreach lib,$(shell find * -type f -iname "*.${EXT_SO}" | grep -v 'libr\.' | grep -v '(lib|parse)/t/' | grep lib | grep -v /bin/ | grep -v /p/), \
@$(foreach lib,$(shell find * -type f -iname "*.${EXT_SO}" | grep -v '(lib|parse)/t/' | grep lib | grep -v /bin/ | grep -v /p/), \
echo " ${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
rm -f "${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
${INSTALL_LIB} "$(lib)" "${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
Expand All @@ -182,9 +182,6 @@ install: install-includes install-pkgconfig
${INSTALL_LIB} "$$FILE" "${DESTDIR}${LIBDIR}/radare2/${VERSION}" ; done
cd "${DESTDIR}${LIBDIR}/radare2" ; ln -fs "${VERSION}" last
#@echo "lang/p/radare.* ${DESTDIR}${DESTDIR}${PREFIX}/${LIBDIR}/radare2/${VERSION}"
#${INSTALL_DATA} lang/p/radare.* ${DESTDIR}${LIBDIR}/radare2/${VERSION}
deinstall uninstall:
# libraries
-@for FILE in `find * | grep -e '\.${EXT_SO}$$' | grep -v 'lib/t' | grep lib` ; do \
Expand Down
2 changes: 1 addition & 1 deletion sys/ios-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ fi
if [ "${#ARCHS}" -gt 0 ]; then
iosClean
iosConfigure
if [ "$?" = 0 ] && [ "${#ARCHS}" -gt 0 ]; then
if [ "$?" = 0 ]; then
export CPU=$ARCHS
export SDK=iphoneos
echo "Building for $CPU"
Expand Down

0 comments on commit 8bab020

Please sign in to comment.