diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-08-16 23:32:35 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-08-16 23:32:35 (GMT) |
| commit | b0d7637c843d61eb79c5d86879296efffe413843 (patch) | |
| tree | c24599ac35664af777d4a20701c9d6eadc11f0ce | |
| parent | 212203d3c83215d60fb3d2d5f174782d2cfd0e0b (diff) | |
| parent | 8a17e67350af18b46425442d1a91714976933d16 (diff) | |
| download | mxe-b0d7637c843d61eb79c5d86879296efffe413843.zip mxe-b0d7637c843d61eb79c5d86879296efffe413843.tar.gz mxe-b0d7637c843d61eb79c5d86879296efffe413843.tar.bz2 | |
Merge branch 'rr--upx-fix'
| -rw-r--r-- | plugins/gcc6/README.md | 1 | ||||
| -rw-r--r-- | src/upx.mk | 4 |
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) | @@ -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 |