1168093 - Move desktop-build compiler/path hacks to their own shell script [TC]

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Morgan Phillips [:mrrrgn]]

This makes it more obvious which parts of our build process need to be trimmed away in favor of a cleaner approach.

Comment 1

[Morgan Phillips [:mrrrgn]]

Attachment: compiler.hacks.diff

Next step will be getting rid of them entirely.

Comment 2

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8610416 [details] [diff] [review]
compiler.hacks.diff

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

::: testing/docker/desktop-build/hacks.sh
@@ +7,5 @@
> +# On ubuntu, the compiler that pip detects (x86_64-linux-gnu-gcc) is not
> +# available in the tooltool compiler, so we end up using the system default;
> +# to get around this, we link to the tooltool compiler that we'd prefer to use.
> +mv /usr/bin/x86_64-linux-gnu-gcc /usr/bin/x86_64-linux-gnu-gcc.orig
> +ln -s /home/worker/workspace/build/src/gcc/bin/gcc /usr/bin/x86_64-linux-gnu-gcc

Does this work at this point in the Dockerfile?  Or in docker at all, before tc-vcs has checked out the source?

Comment 3

[Morgan Phillips [:mrrrgn]]

Yes(In reply to Dustin J. Mitchell [:dustin] from comment #2)
> Comment on attachment 8610416 [details] [diff] [review]
> compiler.hacks.diff
> 
> Review of attachment 8610416 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: testing/docker/desktop-build/hacks.sh
> @@ +7,5 @@
> > +# On ubuntu, the compiler that pip detects (x86_64-linux-gnu-gcc) is not
> > +# available in the tooltool compiler, so we end up using the system default;
> > +# to get around this, we link to the tooltool compiler that we'd prefer to use.
> > +mv /usr/bin/x86_64-linux-gnu-gcc /usr/bin/x86_64-linux-gnu-gcc.orig
> > +ln -s /home/worker/workspace/build/src/gcc/bin/gcc /usr/bin/x86_64-linux-gnu-gcc
> 
> Does this work at this point in the Dockerfile?  Or in docker at all, before
> tc-vcs has checked out the source?

Yes. I built mrrrgn/desktop-build:12 with this.

Comment 4

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8610416 [details] [diff] [review]
compiler.hacks.diff

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

::: testing/docker/desktop-build/hacks.sh
@@ +7,5 @@
> +# On ubuntu, the compiler that pip detects (x86_64-linux-gnu-gcc) is not
> +# available in the tooltool compiler, so we end up using the system default;
> +# to get around this, we link to the tooltool compiler that we'd prefer to use.
> +mv /usr/bin/x86_64-linux-gnu-gcc /usr/bin/x86_64-linux-gnu-gcc.orig
> +ln -s /home/worker/workspace/build/src/gcc/bin/gcc /usr/bin/x86_64-linux-gnu-gcc

Ah, I read the link backward -- I was thinking it would be a problem that build/src didn't exist yet, but of course it's not.

Comment 5

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/07259df3f31f

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/07259df3f31f