firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 09:20:39 +01:00
Code Issues

Fix #7037 - Build problem when using both --with-builtin-tommath and --with-builtin-tomcrypt.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2021-11-02 16:32:12 -03:00
parent 857fa9494d
commit 94479776de
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builds/posix/Makefile.in
View File

@ -75,7 +75,8 @@ ifndef GCC
endif
ifeq ($(TOMMATH_BUILD_FLG),Y)
TOM2TOM_FLAGS=-I../libtommath
TOM2TOM_CFLAGS=-I../libtommath
LTC_LDFLAGS='-L$(LIB) $(subst $,$$$$,$(call LIB_LINK_RPATH,lib))'
endif
.PHONY: master_process cross_process firebird Debug Release external
@ -198,7 +199,7 @@ endif
endif
ifeq ($(TOMCRYPT_BUILD_FLG),Y)
CC="$(CC)" CFLAGS="$(CFLAGS) $(TOM2TOM_FLAGS)" $(MAKE) -C $(ROOT)/extern/libtomcrypt -f makefile.shared GCC=$(GCC)
CC="$(CC)" CFLAGS="$(CFLAGS) $(TOM2TOM_CFLAGS)" $(MAKE) -C $(ROOT)/extern/libtomcrypt -f makefile.shared GCC=$(GCC) LTC_LDFLAGS=$(LTC_LDFLAGS)
ifeq ($(PLATFORM),DARWIN)
install_name_tool -id "@rpath/lib/libtomcrypt.dylib" $(TOMCRYPT)/.libs/libtomcrypt.1.dylib

2
builds/posix/make.defaults
View File

@ -325,7 +325,7 @@ ifeq (@USE_RPATH@,1)
ifeq ($(strip @BINRELOC_CFLAGS@),)
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@))
else
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN/../$(1)')
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,\$$ORIGIN/../$(1))
endif
else
LIB_LINK_RPATH =