Closed Bug 1324607 Opened 3 years ago Closed 3 years ago

include rustc tooltool packages in tooltool manifests.

Categories

(SeaMonkey :: Build Config, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: ewong, Assigned: ewong)

References

Details

Attachments

(3 files)

rustc is now required to build c-c and so we'll need to have 
rustc on our slaves.
Attached patch proposed patchSplinter Review
Assignee: nobody → ewong
Status: NEW → ASSIGNED
Attachment #8820091 - Flags: review?(philip.chee)
Summary: disable rustc in mozconfigs → include rustc tooltool packages in tooltool manifests.
Fwiw.. I had the intention of doing a disable-rustc, but since it's just a tooltool 
change (afaik),  we might as well use that.
Comment on attachment 8820091 [details] [diff] [review]
proposed patch

> +++ b/suite/config/tooltool-manifests/win64/releng.manifest
> +"version": "rustc 1.14.0-beta.2 (e627a2e6e 2016-11-16) repack",
> +"size": 64146480,
> +"digest": "d3a43d755a9819029421ef7f0f2997f79d4e327b38715878e097b633f858e7fb36882eef19ca59751487cef89692f8d082babf1b8196342e75bfe6b1ad9d8e7f",

In Firefox and Thunderbird this is:
"version": "rustc 1.14.0-beta.2 (e627a2e6e 2016-11-16) repack",
"size": 69780370,
"digest": "9eb86b4345f974470efbaddadf9f462af019be3ea4318471eea3c6dbe6e4c2108af7c6d6130b396ecb6550aa105ab8102dfa85b8964ebc1611061e485581cbf3", 

r=me a=me with the above fixed.
Attachment #8820091 - Flags: review?(philip.chee) → review+
Ok. Despite pushing that patch, we're still busted because of the 
topsrcdir in  https://hg.mozilla.org/comm-central/file/tip/build/mozconfig.rust#l4
refers to ./mozilla instead of ./  (c-c source dir).

Since changing build/mozconfig.rust is not going to work as it'll require
a subsequent change in ./mozilla/build/mozilla.rust, this is going to
have to remain within c-c.
I did say it would be better not to touch mozilla's build/mozconfig.rust, but
since this patch (which will have a m-c counterpart) makes no difference for
m-c, it should be safe.  Will ask glandium for a review.
Attachment #8820617 - Flags: review?(philip.chee)
Attached patch m-c's versionSplinter Review
similar to what was done for mozconfig.gtk, it allows us to set where the
rustc binary is by setting the TOOLTOOL_DIR env at compile time, instead
of depending on $topsrcdir.
Attachment #8820618 - Flags: review?(mh+mozilla)
Comment on attachment 8820617 [details] [diff] [review]
proposed patch (v1) use TOOLTOOL_DIR

I don't pretend to understand this but if it unbreaks the builds rs=me
Attachment #8820617 - Flags: review?(philip.chee) → review+
Blocks: 1324027, 1324120
(In reply to Philip Chee from comment #8)
> Comment on attachment 8820617 [details] [diff] [review]
> proposed patch (v1) use TOOLTOOL_DIR
> 
> I don't pretend to understand this but if it unbreaks the builds rs=me

I tried it on the osx64 and it started building.  Now just need glandium's
review.
Attachment #8820618 - Flags: review?(mh+mozilla) → review+
https://hg.mozilla.org/comm-central/rev/399ddd339faa4bd3157a3836af6af921d579f4ee
Bug 1324607 - Use TOOLTOOL_DIR to set the right build path for rustc. r+=RattyAway
Status: ASSIGNED → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.