Skip to content

Commit edca84b

Browse files
committed
Fix MacOS build
1 parent 75165a9 commit edca84b

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,9 +1435,9 @@ dnl # output
14351435
install_name_tool -id @rpath/lib/libicuuc.dylib gen/\$fb_tgt/firebird/lib/libicuuc.dylib
14361436
install_name_tool -id @rpath/lib/libicui18n.dylib gen/\$fb_tgt/firebird/lib/libicui18n.dylib
14371437
install_name_tool -id @rpath/lib/libicudata.dylib gen/\$fb_tgt/firebird/lib/libicudata.dylib
1438-
install_name_tool -change @rpath/libicudata.71.dylib @loader_path/libicudata.71.dylib gen/\$fb_tgt/firebird/lib/libicuuc.71.dylib
1439-
install_name_tool -change @rpath/libicudata.71.dylib @loader_path/libicudata.71.dylib gen/\$fb_tgt/firebird/lib/libicui18n.71.dylib
1440-
install_name_tool -change @rpath/libicuuc.71.dylib @loader_path/libicuuc.71.dylib gen/\$fb_tgt/firebird/lib/libicui18n.71.dylib
1438+
install_name_tool -change @rpath/libicudata.71.1.dylib @loader_path/libicudata.71.1.dylib gen/\$fb_tgt/firebird/lib/libicuuc.71.1.dylib
1439+
install_name_tool -change @rpath/libicudata.71.1.dylib @loader_path/libicudata.71.1.dylib gen/\$fb_tgt/firebird/lib/libicui18n.71.1.dylib
1440+
install_name_tool -change @rpath/libicuuc.71.1.dylib @loader_path/libicuuc.71.1.dylib gen/\$fb_tgt/firebird/lib/libicui18n.71.1.dylib
14411441
;;
14421442
esac
14431443

extern/libtommath/makefile.shared

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ ifndef LIBTOOL
1414
LIBTOOL=libtool
1515
endif
1616

17+
PLATFORM := $(shell uname | sed -e 's/_.*//')
18+
19+
ifeq ($(PLATFORM), Darwin)
20+
NO_UNDEFINED:=-no-undefined
21+
endif
22+
1723
CC = $(LIBTOOL) --mode=compile --tag=CC $(GCC)
1824

1925
CFLAGS += -I./ -Wall -W -Wshadow -Wsign-compare
@@ -94,7 +100,7 @@ bn_mp_to_signed_bin_n.o bn_mp_to_unsigned_bin_n.o
94100
objs: $(OBJECTS)
95101

96102
$(LIBNAME): $(OBJECTS)
97-
$(LIBTOOL) --mode=link --tag=CC $(GCC) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
103+
$(LIBTOOL) --mode=link --tag=CC $(GCC) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) $(NO_UNDEFINED)
98104

99105
install: $(LIBNAME)
100106
install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)

0 commit comments

Comments
 (0)