summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/gcc6/README.md1
-rw-r--r--src/upx.mk4
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md
index 57fcd21..7962f12 100644
--- a/plugins/gcc6/README.md
+++ b/plugins/gcc6/README.md
@@ -65,6 +65,7 @@ versions [[4](https://github.com/mxe/mxe/commit/a1cc019)].
| smpeg | all | [57cb6bb](https://github.com/mxe/mxe/commit/57cb6bb) |
| smpeg2 | all | [1a42cbc](https://github.com/mxe/mxe/commit/1a42cbc) |
| ucl | all | [0ac2a77](https://github.com/mxe/mxe/commit/0ac2a77) |
+| upx | all | [f907a06](https://github.com/mxe/mxe/commit/f907a06) |
| vtk | static (all) | - |
| vtk6 | all | - |
| wxwidgets | static (all) | [6869e3b](https://github.com/mxe/mxe/commit/6869e3b) |
diff --git a/src/upx.mk b/src/upx.mk
index 205ae8f..de53681 100644
--- a/src/upx.mk
+++ b/src/upx.mk
@@ -47,7 +47,9 @@ define $(PKG)_BUILD_$(BUILD)
'CC=$(BUILD_CC)' \
'PKG_CONFIG=$(PREFIX)/$(BUILD)/bin/pkgconf' \
'LIBS=-L$(PREFIX)/$(BUILD)/lib -lucl -lz' \
- $(shell [ `uname -s` == Darwin ] && echo "CXXFLAGS='-Wno-error=unused-local-typedef'") \
+ $(shell [ `uname -s` == Darwin ] && \
+ echo "CXXFLAGS=-Wno-error=unused-local-typedefs -Wno-error=misleading-indentation" || \
+ echo "CXXFLAGS=-Wno-error=misleading-indentation") \
'exeext='
cp '$(1)/src/upx' '$(PREFIX)/$(BUILD)/bin/'
endef