From a14ca59e38c578fab975b3969e3e945a0982a133 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 7 Apr 2011 10:55:57 +0200 Subject: [PATCH] zlib: fixed to build at native stages to only append 'rc' to $AR at cross stage Note: 'AR=ar rc' is hardcoded in the Makefile but while cross-compiling we override it by passing "AR=$arch_target-ar" as makeopt zlib: fixed comment (SQUASH!) --- archiver/zlib/zlib.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/archiver/zlib/zlib.conf b/archiver/zlib/zlib.conf index f55e5e297..bdc2d5b0f 100644 --- a/archiver/zlib/zlib.conf +++ b/archiver/zlib/zlib.conf @@ -29,7 +29,11 @@ if [ "$SDECFG_STATIC" = "0" ] ; then hook_add postmake 3 "zlib_pm" fi -var_append AR " " "rc" +# 'AR=ar rc' is hardcoded in the Makefile but while cross-compiling we +# override it by passing "AR=$arch_target-ar" as makeopt +if atstage cross; then + var_append AR " " "rc" +fi var_append makeinstopt " " "prefix=/$prefix" var_append makeinstopt " " "mandir=$mandir"