From 6885fc51b93ee94197aae5e9ae4e9be503bc9903 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 15 Oct 2012 08:06:53 +0300
Subject: Ccache doesn't like several -arch flags

So make sure just one is passed to the compiler.

Change-Id: I217b7ac34ba20e35a23c18df6b497919061ca44c
---
 nss/nss.patch | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'nss')

diff --git a/nss/nss.patch b/nss/nss.patch
index 5d6730266689..d0e33181ec99 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -26,6 +26,32 @@
  RANLIB		= ranlib
  
  ifndef CPU_ARCH
+@@ -57,19 +57,25 @@
+ 
+ ifeq (,$(filter-out i%86,$(CPU_ARCH)))
+ ifdef USE_64
++ifeq (,$(findstring -arch ,$(CC)))
+ CC              += -arch x86_64
++endif
+ override CPU_ARCH	= x86_64
+ else
+ OS_REL_CFLAGS	= -Di386
++ifeq (,$(findstring -arch ,$(CC)))
+ CC              += -arch i386
++endif
+ override CPU_ARCH	= x86
+ endif
+ else
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
+ OS_REL_CFLAGS	= -Dppc
++ifeq (,$(findstring -arch ,$(CC)))
+ CC              += -arch ppc
++endif
+ endif
+ endif
+ 
 --- misc/nss-3.13.5/mozilla/security/coreconf/FreeBSD.mk	2009-11-23 05:06:29.000000000 -0500
 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/FreeBSD.mk	2012-08-28 20:27:20.000000000 -0400
 @@ -57,6 +57,7 @@
-- 
cgit