Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / ddad1a1568cc6c729bcb317fae411152024437fa / . / import-layers / meta-openembedded / meta-oe / recipes-extended / p7zip / files / do_not_override_compiler_and_do_not_strip.patch
blob: b0a560fe98ca47c8a752cc1081dd8d80685c29e1 [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]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
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame^]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 #
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]16
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame^]17-OPTFLAGS=-O -s
18+OPTFLAGS=-O
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]19
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame^]20 ALLFLAGS=${OPTFLAGS} -pipe \
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]21 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame^]22@@ -10,8 +10,6 @@ ALLFLAGS=${OPTFLAGS} -pipe \
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]23 -D_7ZIP_LARGE_PAGES \
24 $(LOCAL_FLAGS)
25
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame^]26-CXX=g++
27-CC=gcc
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]28 CC_SHARED=-fPIC
29 LINK_SHARED=-fPIC -shared
30