Closed Bug 1036569 Opened 5 years ago Closed 5 years ago

Calculation of NSS_STATIC_LIBS should remove carriage returns

Categories

(Firefox Build System :: General, defect)

All
Windows XP
defect
Not set

Tracking

(firefox-esr31 fixed, b2g-v2.0 fixed)

RESOLVED FIXED
mozilla33
Tracking Status
firefox-esr31 --- fixed
b2g-v2.0 --- fixed

People

(Reporter: mshal, Assigned: mshal)

References

Details

Attachments

(1 file, 1 obsolete file)

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.
Assignee: nobody → mshal
Attachment #8453244 - Flags: review?(mh+mozilla)
Blocks: 978211
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?
Attachment #8453244 - Flags: review?(mh+mozilla) → review+
Derp, that works too :). r+ carried forward.
Attachment #8453244 - Attachment is obsolete: true
Attachment #8453814 - Flags: review+
https://hg.mozilla.org/mozilla-central/rev/1ac686c5f344
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla33
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.