Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › ad514ab
Attempt to fix linking on OSX
Baptiste Daroussin committed 7 years ago
commit ad514ab5f31b5eb8e73c19de3bf6a5bd9f6e24a5
parent cf59deb
2 files changed +7 -2
modified libpkg/Makefile.autosetup
@@ -70,8 +70,7 @@ LOCAL_LDFLAGS= @REPOS_LDFLAGS@ \
		-L$(top_builddir)/external/libfetch -lfetch_pic \

		-lssl \

		-lcrypto \
- 
		-lm \
- 
		-Wl,--version-script=$(top_builddir)/libpkg/libpkg.ver
+ 
		-lm



STATIC_LIBS=	@REPOS_STATIC_LIBS@ \

		$(top_builddir)/external/sqlite/libsqlite.a \
@@ -102,6 +101,7 @@ LOCAL_LDFLAGS+= -L$(top_builddir)/external/libmachista -lmachista_pic
SRC+=		pkg_macho.c

@else

SRC+=		pkg_elf.c
+ 
LOCAL_LDFLAGS+=	-Wl,--version-script=$(top_builddir)/libpkg/libpkg.ver \

@endif



@if libabidir == libelf
modified src/Makefile.autosetup
@@ -64,7 +64,12 @@ OTHER_LIBS+= -ldl
OTHER_LIBS+=	-lresolv

@endif
+ 
@if libabidir == libmachista

LOCAL_LDFLAGS=	-Wl,-Bstatic $(LIBS) -Wl,-Bdynamic $(OTHER_LIBS)
+ 
@else
+ 
LOCAL_LDFLAGS=	$(LIBS) $(OTHER_LIBS)
+ 
@endif
+ 


STATIC_LDFLAGS=	$(LIBS) $(OTHER_LIBS)



include $(MK)/prog.mk