aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <jberkenbilt@users.noreply.github.com>2019-02-02 14:55:23 +0100
committerGitHub <noreply@github.com>2019-02-02 14:55:23 +0100
commita46c29320f3728ef2d174342bf803c8530e9e08e (patch)
tree8c6bd95233c36959b8acd60976a44e1c24c880e5
parent03074ca5a071527f85954d02081413a6b4e0d020 (diff)
parentdf7ef11181fbaf3086dd2f5897ed1b0b7080c682 (diff)
downloadqpdf-a46c29320f3728ef2d174342bf803c8530e9e08e.tar.zst
Merge pull request #222 from ryandesign/LDFLAGS-order
Ensure zlib-flate doesn't link with an old libqpdf
-rw-r--r--zlib-flate/build.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/zlib-flate/build.mk b/zlib-flate/build.mk
index 3a17f94e..bb7f75e3 100644
--- a/zlib-flate/build.mk
+++ b/zlib-flate/build.mk
@@ -19,4 +19,4 @@ $(OBJS_zlib-flate): zlib-flate/$(OUTPUT_DIR)/%.$(OBJ): zlib-flate/%.cc
$(call compile,$<,$(INCLUDES_zlib-flate))
zlib-flate/$(OUTPUT_DIR)/$(call binname,zlib-flate): $(OBJS_zlib-flate)
- $(call makebin,$(OBJS_zlib-flate),$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS))
+ $(call makebin,$(OBJS_zlib-flate),$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS))