From 74e6f8d66132636958f72bf1840d36de7a409ee1 Mon Sep 17 00:00:00 2001
From: malc <moosotc@gmail.com>
Date: Sat, 6 Jun 2020 10:04:23 +0300
Subject: [PATCH] Sync with upstream

https://github.com/moosotc/llpp/issues/135
---
 build.bash       | 1 -
 misc/getmupdf.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.bash b/build.bash
index 07d4ee5..fa14c60 100755
--- a/build.bash
+++ b/build.bash
@@ -299,7 +299,6 @@ fi
 
 ord=$(grep -v \.cmi $outd/ordered)
 cmd="ocamlc -custom $libs -o $outd/llpp $cobjs $(echo $ord) -cclib \"$clibs\""
-cmd="$cmd -ccopt -Wl,-z,noexecstack"
 keycmd="digest $outd/llpp $cobjs $ord $mulibs"
 isfresh "$outd/llpp" "$cmd$(eval $keycmd)" || {
     echo linking $outd/llpp
diff --git a/misc/getmupdf.sh b/misc/getmupdf.sh
index 9cfbe85..46965e8 100644
--- a/misc/getmupdf.sh
+++ b/misc/getmupdf.sh
@@ -3,7 +3,7 @@ set -eu
 
 MUPDF_OUTPUT_DIR="$1"
 MUPDF_URL="https://github.com/ArtifexSoftware/mupdf"
-MUPDF_DESIRED_VERSION="1512d2156c5e0446ab590fc09fa41274faf244d6"
+MUPDF_DESIRED_VERSION="43790a089627def8f40f298e2c16e10f9035fcc3"
 
 if [ ! -d ${MUPDF_OUTPUT_DIR} ]; then
     echo "mupdf does not exist, fetching it from ${MUPDF_URL}"
-- 
2.11.4.GIT