--- Makerules	2026-02-19 00:24:19.000000000 +0800
+++ Makerules	2026-05-19 21:40:22.000000000 +0800
@@ -122,7 +122,7 @@
   endif
   LIB_CFLAGS = -fPIC
   ifeq ($(OS),Darwin)
-    LIB_LDFLAGS = -dynamiclib
+    LIB_LDFLAGS = -dynamiclib -Wl,-install_name,$(PREFIX)/lib/libmupdf.$(SO)
   else ifeq ($(OS),wasm)
     LIB_LDFLAGS = -shared -sSIDE_MODULE
     EXE_LDFLAGS = -sMAIN_MODULE
@@ -216,10 +216,10 @@
   HAVE_GLUT := yes
   SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
   SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
-  CC = xcrun cc
-  AR = xcrun ar
-  LD = xcrun ld
-  RANLIB = xcrun ranlib
+  CC = cc
+  AR = ar
+  LD = ld
+  RANLIB = ranlib
 
   ifneq ($(ARCHFLAGS),)
     $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
@@ -234,8 +234,6 @@
     endif
   endif
 
-else
-
   ifeq ($(OS),Linux)
     HAVE_OBJCOPY := yes
   endif
@@ -307,21 +305,6 @@
     SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
   endif
 
-  ifeq ($(HAVE_GLUT),)
-    HAVE_GLUT := $(shell pkg-config --exists gl x11 xrandr && echo yes)
-  endif
-  ifeq ($(HAVE_GLUT),yes)
-    SYS_GL_CFLAGS := $(shell pkg-config --cflags gl x11 xrandr)
-    SYS_GL_LIBS := $(shell pkg-config --libs gl x11 xrandr)
-    ifeq ($(shell pkg-config --exists glut && echo yes),yes)
-      SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
-      SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
-    else
-      SYS_GLUT_CFLAGS :=
-      SYS_GLUT_LIBS := -lglut
-    endif
-  endif
-
   ifeq ($(HAVE_X11),)
     HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
   endif
@@ -330,14 +313,6 @@
     X11_LIBS := $(shell pkg-config --libs x11 xext)
   endif
 
-  ifeq ($(HAVE_LIBCRYPTO),)
-    HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
-  endif
-  ifeq ($(HAVE_LIBCRYPTO),yes)
-    LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
-    LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-  endif
-
   HAVE_PTHREAD := yes
   ifeq ($(HAVE_PTHREAD),yes)
     PTHREAD_CFLAGS :=

--- Makefile	2026-02-19 00:24:19.000000000 +0800
+++ Makefile	2026-05-19 21:46:05.000000000 +0800
@@ -81,7 +81,7 @@
 ifdef RANLIB
   RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@
 endif
-LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(EXE_LDFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CXX) $(EXE_LDFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 TAGS_CMD = $(QUIET_TAGS) ctags
 OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z noexecstack -o $@ $<
 SYMLINK_CMD = $(QUIET_SYMLINK) $(MKTGTDIR) ; ln -sf
@@ -94,7 +94,7 @@
   endif
   ifeq ($(OS),OpenBSD)
     # OpenBSD linker magic doesn't use soname; so fake it by using -L$(OUT) and -lmupdf.
-    LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(EXE_LDFLAGS) $(LDFLAGS) -o $@ -L$(OUT) \
+    LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CXX) $(EXE_LDFLAGS) $(LDFLAGS) -o $@ -L$(OUT) \
 	$(subst $(OUT)/libmupdf.$(SO)$(SO_VERSION),-lmupdf,$^) \
 	$(LIBS)
   endif
@@ -489,10 +489,14 @@
 install-libs: libs install-headers
 	install -d $(DESTDIR)$(libdir)
 ifeq ($(shared),yes)
+  ifeq ($(OS),Darwin)
+	install -m $(SO_INSTALL_MODE) $(OUT)/libmupdf.$(SO) $(DESTDIR)$(libdir)/libmupdf.$(SO)
+  else
 	install -m $(SO_INSTALL_MODE) $(OUT)/libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION)
-  ifneq ($(OS),OpenBSD)
-	ln -sf libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION_MAJOR)
-	ln -sf libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)
+    ifneq ($(OS),OpenBSD)
+	  ln -sf libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION_MAJOR)
+	  ln -sf libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)
+    endif
   endif
 else
 	install -m 644 $(MUPDF_LIB) $(DESTDIR)$(libdir)