From d3096198c87de283d0ee1f8ce2ab10657fd7991d Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 29 Oct 2017 22:34:08 +1300 Subject: [PATCH] [libsnark] Use POSIX-compliant ar arguments --- src/snark/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/snark/Makefile b/src/snark/Makefile index 32b8609f2..1583facf7 100644 --- a/src/snark/Makefile +++ b/src/snark/Makefile @@ -198,13 +198,8 @@ $(LIBGTEST_A): $(GTESTDIR)/src/gtest-all.cc $(DEPINST_EXISTS) # libsnark.a will contains all of our relevant object files, and we also mash in the .a files of relevant dependencies built by ./prepare-depends.sh $(LIBSNARK_A): $(LIB_OBJS) $(AR_LIBS) - ( \ - echo "create $(LIBSNARK_A)"; \ - echo "addmod $(LIB_OBJS)"; \ - if [ -n "$(AR_LIBS)" ]; then for AR_LIB in $(AR_LIBS); do echo addlib $$AR_LIB; done; fi; \ - echo "save"; \ - echo "end"; \ - ) | $(AR) -M + $(AR) q $(LIBSNARK_A) $(LIB_OBJS) + if [ -n "$(AR_LIBS)" ]; then mkdir -p tmp-ar; cd tmp-ar; for AR_LIB in $(AR_LIBS); do $(AR) x $$AR_LIB; done; $(AR) qc $(LIBSNARK_A) tmp-ar/*; cd ..; rm -r tmp-ar; fi; $(AR) s $(LIBSNARK_A) libsnark.so: $(LIBSNARK_A) $(DEPINST_EXISTS)