* Fix static and nonpic build with no gmp

* Needs to rerun configur-plugins
This commit is contained in:
pancake/n900 2010-11-10 10:45:47 +01:00
parent aacce16095
commit 9580907a35
4 changed files with 14 additions and 12 deletions

View File

@ -6,5 +6,8 @@ BINDEPS+=r_sign r_print r_lang r_asm r_syscall r_hash r_line r_socket r_flags r_
include ../binr.mk
ifeq ($(WITHNONPIC),1)
LDFLAGS+=${DL_LIBS} -lm -lgmp -lpthread
LDFLAGS+=${DL_LIBS} -lm -lpthread
ifeq ($(HAVE_LIB_GMP),1)
LDFLAGS+=-lgmp
endif
endif

View File

@ -6,5 +6,8 @@ BINDEPS+=r_sign r_print r_lang r_asm r_syscall r_hash r_line r_socket r_util
include ../binr.mk
ifeq ($(WITHNONPIC),1)
LDFLAGS+=${DL_LIBS} -lm -lgmp
LDFLAGS+=${DL_LIBS} -lm
ifeq ($(HAVE_LIB_GMP),1)
LDFLAGS+=-lgmp
endif
endif

View File

@ -4,5 +4,8 @@ BINDEPS=r_anal r_lib r_reg r_util
include ../binr.mk
ifeq ($(WITHNONPIC),1)
LDFLAGS+=${DL_LIBS} -lm -lgmp -lpthread
LDFLAGS+=${DL_LIBS} -lm -lpthread
ifeq ($(HAVE_LIB_GMP),1)
LDFLAGS+=-lgmp
endif
endif

View File

@ -1,10 +1,5 @@
# config.mk.tail
ifneq (${BINDEPS},)
include ../../../config-user.mk
include ../../../global.mk
include ../../../mk/${COMPILER}.mk
else
-include ../../config-user.mk
-include ../../global.mk
-include ../../mk/${COMPILER}.mk
@ -12,8 +7,6 @@ else
-include ../../../config-user.mk
-include ../../../global.mk
-include ../../../mk/${COMPILER}.mk
endif
CFLAGS+=-DUSE_RIO=${USE_RIO}
CFLAGS+=${CFLAGS_APPEND}
@ -27,10 +20,10 @@ CFLAGS+=${PIC_CFLAGS}
LDFLAGS+=${PIC_CFLAGS}
else
# TODO: is there somebody brave enought to replace this perl oneliner?
ifneq ($(DEPS), )
ifneq ($(DEPS),)
LDFLAGS+=`echo "${DEPS} " | perl -ne 's,r_([^ ]*),../$$1/libr_$$1.a,g; print'`
endif
ifneq ($(BINDEPS), )
ifneq ($(BINDEPS),)
LDFLAGS+=`echo "${BINDEPS} " | if [ -d ../../libr ]; then perl -ne 's,r_([^ ]*),../../libr/$$1/libr_$$1.a,g; print' ; else perl -ne 's,r_([^ ]*),../../$$1/libr_$$1.a,g; print' ; fi `
endif
endif