summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2016-05-02 11:12:51 (GMT)
committerBoris Nagaev <bnagaev@gmail.com>2016-05-02 11:12:51 (GMT)
commitb4679a07616263538fe3cfa31f1e2e412b8ecd75 (patch)
tree53db38036dabe97479d699272d4a98510d5e2e26
parentd8f1d36d71519e868b218aae3774c773ec89c199 (diff)
parenta1cc0195abd91827d347449a52336d0031b48d52 (diff)
downloadmxe-b4679a07616263538fe3cfa31f1e2e412b8ecd75.zip
mxe-b4679a07616263538fe3cfa31f1e2e412b8ecd75.tar.gz
mxe-b4679a07616263538fe3cfa31f1e2e412b8ecd75.tar.bz2
Merge pull request #1323 from tehnick/fix-jsoncpp
jsoncpp: fix build with GCC < 6.x
-rw-r--r--src/jsoncpp.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk
index 532d20b..f7ef89a 100644
--- a/src/jsoncpp.mk
+++ b/src/jsoncpp.mk
@@ -11,7 +11,7 @@ $(PKG)_URL := https://github.com/open-source-parsers/jsoncpp/archive/$($(PK
$(PKG)_DEPS := gcc
# workaround for builds with GCC >= 6.x
-$(PKG)_CXXFLAGS := -Wno-error=conversion -Wno-error=shift-negative-value
+$(PKG)_CXXFLAGS := -Wno-error=conversion -Wno-shift-negative-value
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://github.com/open-source-parsers/jsoncpp/archive/' | \