Use jerboa-qt libdir for static Qt build
ober
115d75e4ac4d8db36d2327c931723b50b4dec01d
--- a/Makefile +++ b/Makefile @@ -1439,9 +1439,9 @@ linux-qt-local: vendor-deps cp -a vendor/jerboa-qt/. /tmp/jemacs-build/jerboa-qt/ find /tmp/jemacs-build/jerboa-qt -name '*.so' -delete 2>/dev/null; true find /tmp/jemacs-build/jerboa-qt -name '*.wpo' -delete 2>/dev/null; true - JEMACS_STATIC=1 $(MUSL_SCHEME) --libdirs /tmp/jemacs-build/jerboa-qt \ + JEMACS_STATIC=1 $(MUSL_SCHEME) --libdirs /tmp/jemacs-build/jerboa-qt/lib \ --compile-imported-libraries --script /tmp/jemacs-build/jerboa-qt/compile-libs.ss - rm -f /tmp/jemacs-build/jerboa-qt/jerboa-qt/*.wpo + rm -f /tmp/jemacs-build/jerboa-qt/lib/jerboa-qt/*.wpo cp support/vendor-overrides/jerboa-pcre2-ffi-static.ss $(MUSL_PCRE2)/jerboa-pcre2/ffi.ss $(MUSL_SCHEME) --libdirs $(MUSL_PCRE2) \ --compile-imported-libraries --script support/vendor-overrides/jerboa-pcre2-compile-libs.ss @@ -1514,7 +1514,7 @@ linux-qt-local: vendor-deps JSH_DIR=$(MUSL_JSH) \ JERBOA_PCRE2_DIR=$(MUSL_PCRE2) \ JERBOA_SCINTILLA_DIR=$(MUSL_SCINTILLA)/src \ - JERBOA_QT_DIR=/tmp/jemacs-build/jerboa-qt \ + JERBOA_QT_DIR=/tmp/jemacs-build/jerboa-qt/lib \ JERBOA_QT_SHIM_DIR=$(QT_STATIC_SHIM_DIR) \ JSH_COREUTILS_LIB=support/vendor-overrides/libjsh_coreutils_stub.a \ $(AWS_LOCAL_STATIC_ENV) \ @@ -1525,7 +1525,7 @@ linux-qt-local: vendor-deps TREE_SITTER_QUERIES_OBJ=/tmp/jemacs-build/treesitter_queries.o \ PKG_CONFIG_PATH=$(QT_STATIC_PREFIX)/lib/pkgconfig \ $(MUSL_SCHEME) \ - --libdirs lib:$(MUSL_JERBOA)/lib:$(MUSL_JSH):$(COREUTILS):$(JSH_AWK):$(JSH_SED):$(JERBOA_SSH):$(JERBOA_SQLITE):$(JERBOA_CRYPTO):$(JERBOA_FUSE):$(MUSL_PCRE2):$(MUSL_SCINTILLA)/src:/tmp/jemacs-build/jerboa-qt$(AWS_LOCAL_STATIC_LIBDIRS) \ + --libdirs lib:$(MUSL_JERBOA)/lib:$(MUSL_JSH):$(COREUTILS):$(JSH_AWK):$(JSH_SED):$(JERBOA_SSH):$(JERBOA_SQLITE):$(JERBOA_CRYPTO):$(JERBOA_FUSE):$(MUSL_PCRE2):$(MUSL_SCINTILLA)/src:/tmp/jemacs-build/jerboa-qt/lib$(AWS_LOCAL_STATIC_LIBDIRS) \ --script build-binary-qt.ss @echo "" @echo "=== jemacs-qt static binary built ==="