786e240 'Fix' static build on osx — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

'Fix' static build on osx

Vsevolod Stakhov committed 6 years ago

commit 786e2400c66711d7012564e44854ad051b7bd698
parent 7c595e4

1 file changed +6 -2

modified src/Makefile.autosetup

@@ -67,15 +67,19 @@ OTHER_LIBS+= -lresolv

 @if libabidir == libmachista
 LOCAL_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv
 STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv
 # OSX doesn't support static binaries, sigh
 STATIC_ARG=
 @else
 LOCAL_LDFLAGS=	-Wl,-Bstatic \
 		@waflags@ $(LIBPKGFLAT) @nowaflags@ \
 		$(LIBS) \
 		-Wl,-Bdynamic $(OTHER_LIBS) \
 		-Wl,--export-dynamic
 STATIC_ARG=	-static
 STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS)
 @endif
 STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS)
 include $(MK)/prog.mk

@@ -84,7 +88,7 @@ all: pkg-static

 install: install-static
 pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat.a
 	$(CC) -o $@ $(OBJS) -static $(LDFLAGS) $(STATIC_LDFLAGS)
 	$(CC) -o $@ $(OBJS) $(STATIC_ARG) $(LDFLAGS) $(STATIC_LDFLAGS)
 install-static: pkg-static
 	install -d -m 755 $(DESTDIR)$(sbindir)