1 From 730158700ea7a554c37f24bfbf5f4985f7280f3e Mon Sep 17 00:00:00 2001
2 From: Peter Korsgaard <jacmet@sunsite.dk>
3 Date: Wed, 6 Feb 2013 14:07:02 +0100
4 Subject: [PATCH] strpool: don't mix up host/build flags when cross compiling
6 Submitted upstream as https://bugs.freedesktop.org/show_bug.cgi?id=60364
8 Commit b71035ce89 (build-sys: modernize build system) changed the strpool
9 (which needs to be built for the build machine) compilation to use
10 AM_CFLAGS / AM_LDFLAGS rather than CFLAGS / LDFLAGS. This is wrong, as
11 The AM_ version is used TOGETHER with (the user supplied) CFLAGS/LDFLAGS,
12 causing strpool to use both CFLAGS (for host) and CCFLAGS_FOR_BUILD (for
13 build) flags, breaking cross compilation with errors like:
15 cc1: error: unrecognized command line option "-mabi=spe"
17 Instead overwrite the (user supplied) CFLAGS with the (user supplied)
18 CFLAGS_FOR_BUILD (and similar for LDFLAGS) like we used to do.
20 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
22 strpool/Makefile.am | 4 ++--
23 1 file changed, 2 insertions(+), 2 deletions(-)
25 diff --git a/strpool/Makefile.am b/strpool/Makefile.am
26 index b041cea..5b335a5 100644
27 --- a/strpool/Makefile.am
28 +++ b/strpool/Makefile.am
30 # <http://www.gnu.org/licenses/>.
33 -AM_CFLAGS = @BUILD_CFLAGS@
34 -AM_LDFLAGS = @BUILD_LDFLAGS@
35 +CFLAGS = @BUILD_CFLAGS@
36 +LDFLAGS = @BUILD_LDFLAGS@