1561510 - Removing -arch XXX args from CC doesn't work

Status: RESOLVED FIXED

(NSS :: Build, defect, P1)

Description

[Martin Thomson [:mt:]]

The code added in a fixup to Bug 1310168 introduced a regression when Bug 1418944 landed. I have no idea how this worked.

At its core, this is what we have:

CC = cc -arch x86_64
X := CC="$(CC)"
X := $(filter-out -arch x86_64,$(X))

However, because the x86_64 is adjacent the quote, we end up with it not being filtered correctly.

Arguably, this code is not right, because it also removes x86_64 arguments that don't follow -arch, but we can at least un-break it by adding the filtering at the right place.

Comment 1

[Martin Thomson [:mt:]]

Here's what I have now:

remove_arch = $(filter-out __REMOVEME%,$(subst $(NULL) -arch , __REMOVEME,$(1)))
ifdef CC
NSPR_CONFIGURE_ENV = CC="$(call remove_arch,$(CC))"
endif
ifdef CCC
NSPR_CONFIGURE_ENV += CXX="$(call remove_arch,$(CC))"
endif

That seems to work.

Comment 2

[Martin Thomson [:mt:]]

Attachment: Bug 1561510 - Fix removal of -arch arguments, r?kjacobs

This faithfully removes just -arch arguments. It's not clear to me whether NSPR
can handle other arguments to CC either. Maybe this should just use
$(first-word $(CC)) instead...

Comment 3

[J.C. Jones [:jcj] (he/they)]

https://hg.mozilla.org/projects/nss/rev/4f80a4077e401bf774905dfee5f025a237707151