1036569 - Calculation of NSS_STATIC_LIBS should remove carriage returns

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Michael Shal [:mshal]]

In security/build/Makefile.in NSS_STATIC_LIBS is calculated with a $(shell) command. In some circumstances on Windows builds, this can result in a carriage return ('\r') in the variable, which prevents $(filter-out %.lib) from working properly.

Comment 1

[Michael Shal [:mshal]]

Attachment: 0002-Bug-1036569-Fix-NSS_STATIC_LIBS-with-carriage-return.patch

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8453244 [details] [diff] [review]
0002-Bug-1036569-Fix-NSS_STATIC_LIBS-with-carriage-return.patch

Review of attachment 8453244 [details] [diff] [review]:
-----------------------------------------------------------------

::: security/build/Makefile.in
@@ +284,5 @@
>  # TODO: The following can be replaced by something simpler when bug 844880
>  # is fixed.
>  # All static libraries required for nss, smime, ssl and nssutil.
> +# Linefeeds are removed with tr, since they hang around in some cases on Windows.
> +NSS_STATIC_LIBS := $(shell $(MAKE) --no-print-directory -f $(srcdir)/nss.mk DEPTH='$(DEPTH)' topsrcdir='$(topsrcdir)' srcdir='$(srcdir)' echo-variable-libs | tr -d '\r')

Why not simply $(strip $(shell)) without tr?

Comment 3

[Michael Shal [:mshal]]

Attachment: 0001-Bug-1036569-Fix-NSS_STATIC_LIBS-with-carriage-return.patch

Derp, that works too :). r+ carried forward.

Comment 4

[Michael Shal [:mshal]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/1ac686c5f344

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/1ac686c5f344