Merge pull request #1496 from tonytheodore/upx

upx: disable -Werror on native builds
mxe · Aug 21, 2016 · b803ca6 · b803ca6
2 parents 445bdf6 + 4677f44
commit b803ca6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md
@@ -65,7 +65,6 @@ 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
@@ -22,34 +22,34 @@ define $(PKG)_BUILD
     $(call PREPARE_PKG_SOURCE,ucl,$(1))
     mkdir '$(1)/lzma'
     $(call PREPARE_PKG_SOURCE,lzma,$(1)/lzma)
+
     UPX_UCLDIR='$(1)/$(ucl_SUBDIR)' \
-        UPX_LZMADIR='$(1)/lzma' \
-        UPX_LZMA_VERSION=0x$(subst .,,$(lzma_VERSION)) \
-        $(MAKE) -C '$(1)' -j '$(JOBS)' all \
-        'CXX=$(TARGET)-g++' \
-        'CC=$(TARGET)-gcc' \
-        'LD=$(TARGET)-ld' \
-        'AR=$(TARGET)-ar' \
-        'PKG_CONFIG=$(TARGET)-pkg-config' \
-        'exeext=.exe'
+    UPX_LZMADIR='$(1)/lzma' \
+    UPX_LZMA_VERSION=0x$(subst .,,$(lzma_VERSION)) \
+    $(MAKE) -C '$(1)' -j '$(JOBS)' all \
+        CXX='$(TARGET)-g++' \
+        CC='$(TARGET)-gcc' \
+        LD='$(TARGET)-ld' \
+        AR='$(TARGET)-ar' \
+        PKG_CONFIG='$(TARGET)-pkg-config' \
+        exeext='.exe'
     cp '$(1)/src/upx.exe' '$(PREFIX)/$(TARGET)/bin/'
 endef
 
 define $(PKG)_BUILD_$(BUILD)
     $(call PREPARE_PKG_SOURCE,ucl,$(1))
     mkdir '$(1)/lzma'
     $(call PREPARE_PKG_SOURCE,lzma,$(1)/lzma)
+
     UPX_UCLDIR='$(1)/$(ucl_SUBDIR)' \
-        UPX_LZMADIR='$(1)/lzma' \
-        UPX_LZMA_VERSION=0x$(subst .,,$(lzma_VERSION)) \
-        $(MAKE) -C '$(1)' -j '$(JOBS)' all \
-        'CXX=$(BUILD_CXX)' \
-        '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-typedefs -Wno-error=misleading-indentation" || \
-            echo "CXXFLAGS=-Wno-error=misleading-indentation") \
-        'exeext='
+    UPX_LZMADIR='$(1)/lzma' \
+    UPX_LZMA_VERSION=0x$(subst .,,$(lzma_VERSION)) \
+    $(MAKE) -C '$(1)' -j '$(JOBS)' all \
+        CXX='$(BUILD_CXX)' \
+        CC='$(BUILD_CC)' \
+        PKG_CONFIG='$(PREFIX)/$(BUILD)/bin/pkgconf' \
+        LIBS='-L$(PREFIX)/$(BUILD)/lib -lucl -lz' \
+        CXXFLAGS_WERROR= \
+        exeext=
     cp '$(1)/src/upx' '$(PREFIX)/$(BUILD)/bin/'
 endef