1do not override compiler and do not strip 2 3The default makefile sets the compiler to g++ or gcc. This leads to a wrong architecture when cross-compiling. 4Remove the hardcoded compiler and just append the flags to CXX and CC. 5 6Upstream-Status: Pending 7Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com> 8Reviewed-By: Pascal Bach <pascal.bach@siemens.com> 9 10diff -Nurp p7zip_15.14.1_orig/makefile.machine p7zip_15.14.1/makefile.machine 11--- p7zip_15.14.1_orig/makefile.machine 2016-03-23 20:37:47.000000000 +0100 12+++ p7zip_15.14.1/makefile.machine 2016-06-17 15:33:39.720454477 +0200 13@@ -2,7 +2,7 @@ 14 # makefile for Linux (x86, PPC, alpha ...) 15 # 16 17-OPTFLAGS=-O -s 18+OPTFLAGS=-O 19 20 ALLFLAGS=${OPTFLAGS} -pipe \ 21 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ 22@@ -10,8 +10,6 @@ ALLFLAGS=${OPTFLAGS} -pipe \ 23 -D_7ZIP_LARGE_PAGES \ 24 $(LOCAL_FLAGS) 25 26-CXX=g++ 27-CC=gcc 28 CC_SHARED=-fPIC 29 LINK_SHARED=-fPIC -shared 30 31