update osx to build clamlib_util.a first as well

nochowderforyou · Dec 20, 2019 · fbba69c · fbba69c
1 parent 7612a12
commit fbba69c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
@@ -103,6 +103,7 @@ script: |
   # Create the release tarball using (arbitrarily) the first host
   ./autogen.sh
   CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
+  make src/libclam_util.a
   make dist
   SOURCEDIST=`echo clam-*.tar.gz`
   DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
@@ -125,6 +126,7 @@ script: |
     tar --strip-components=1 -xf ../$SOURCEDIST
 
     CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
+    make ${MAKEOPTS} src/libclam_util.a
     make ${MAKEOPTS}
     make install-strip DESTDIR=${INSTALLPATH}
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -447,17 +447,22 @@ if GLIBC_BACK_COMPAT
 endif
 
 
-if TARGET_WINDOWS
+if TARGET_WINDOWS 
 libclamconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) $(LIBCLAM_UTIL)
 libclamconsensus_la_LIBADD = $(LIBSECP256K1) $(CRYPTO_LIBS) $(BOOST_LIBS)
 libclamconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_CLAM_INTERNAL $(SSL_CFLAGS) $(BOOST_CPPFLAGS)
 else
+if TARGET_DARWIN
+libclamconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) $(LIBCLAM_UTIL)
+libclamconsensus_la_LIBADD = $(LIBSECP256K1) $(CRYPTO_LIBS) $(BOOST_LIBS)
+libclamconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_CLAM_INTERNAL $(SSL_CFLAGS) $(BOOST_CPPFLAGS)
+else 
 libclamconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
 libclamconsensus_la_LIBADD = $(LIBSECP256K1) $(CRYPTO_LIBS)
 libclamconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_CLAM_INTERNAL $(SSL_CFLAGS)
 endif
+endif
 libclamconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
-
 endif
 #