Fix sys/sdk.sh (--without-gpl)

This commit is contained in:
pancake 2018-09-26 10:03:32 -07:00
parent 35d916490f
commit 8caa2ba2ee
3 changed files with 11 additions and 7 deletions

View File

@ -77,8 +77,10 @@ endif
libr.${EXT_AR}: .libr
${AR} crs $@ .libr/*.o
E+=../shlr/ar/libr_ar.${EXT_AR}
ifeq (1,$(WITH_GPL))
E+=../shlr/grub/libgrubfs.${EXT_AR}
endif
E+=../shlr/ar/libr_ar.${EXT_AR}
E+=../shlr/windbg/libr_windbg.${EXT_AR}
E+=../shlr/qnx/lib/libqnxr.${EXT_AR}
E+=../shlr/bochs/lib/libbochs.${EXT_AR}

View File

@ -6,7 +6,9 @@ SHLR=../../shlr/
include ../config.mk
CFLAGS+=-I$(SHLR)/grub/include
ifeq ($(WITH_GPL),1)
LDFLAGS+=$(SHLR)/grub/libgrubfs.a
endif
EXTRA_TARGETS=plugins
foo:

View File

@ -32,10 +32,10 @@ AR=`uname -m`
SF=r2sdk-${OS}-${AR}
(
cd ${WRKDIR}
mv r2-sdk ${SF}
zip -r ${SF}.zip ${SF}
cd "${WRKDIR}"
mv r2-sdk "${SF}"
zip -r "${SF}".zip "${SF}"
)
mv ${WRKDIR}/${SF} .
mv ${WRKDIR}/${SF}.zip .
ln -fs ${SF} r2sdk
mv "${WRKDIR}/${SF}" .
mv "${WRKDIR}/${SF}".zip .
ln -fs "${SF}" r2sdk