1 files changed, 65 insertions, 14 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index b6f3ae6a..59f2b532 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -41,20 +41,22 @@ chunks:
 - name: stage1-binutils
   morph: strata/build-essential/stage1-binutils.morph
   repo: upstream:binutils-redhat
-  ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
-  unpetrify-ref: baserock/build-essential
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
+  unpetrify-ref: baserock/tiagogomes/update-toolchain
   build-depends: []
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage1-gcc
   morph: strata/build-essential/stage1-gcc.morph
   repo: upstream:gcc-tarball
-  ref: 999c918a7ad32ad436395666def22ab90b3447fe
-  unpetrify-ref: baserock/build-essential
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/tiagogomes/update-toolchain
   build-depends:
   - stage1-binutils
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-linux-api-headers
   morph: strata/build-essential/stage2-linux-api-headers.morph
   repo: upstream:linux
@@ -65,6 +67,7 @@ chunks:
   - stage1-gcc
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-glibc
   morph: strata/build-essential/stage2-glibc.morph
   repo: upstream:glibc
@@ -76,40 +79,57 @@ chunks:
   - stage2-linux-api-headers
   build-mode: bootstrap
   prefix: /tools
+
+- name: stage2-libstdc++
+  morph: strata/build-essential/stage2-libstdc++.morph
+  repo: upstream:gcc-tarball
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-glibc
+  build-mode: bootstrap
+  prefix: /tools
+
 - name: stage2-binutils
   morph: strata/build-essential/stage2-binutils.morph
   repo: upstream:binutils-redhat
-  ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
-  unpetrify-ref: baserock/build-essential
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
+  unpetrify-ref: baserock/tiagogomes/update-toolchain
   build-depends:
   - stage1-binutils
   - stage1-gcc
   - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-gcc-fixed-headers
   morph: strata/build-essential/stage2-gcc-fixed-headers.morph
   repo: upstream:gcc-tarball
-  ref: 999c918a7ad32ad436395666def22ab90b3447fe
-  unpetrify-ref: baserock/build-essential
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/tiagogomes/update-toolchain
   build-depends:
   - stage1-binutils
   - stage1-gcc
   - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-gcc
   morph: strata/build-essential/stage2-gcc.morph
   repo: upstream:gcc-tarball
-  ref: 999c918a7ad32ad436395666def22ab90b3447fe
-  unpetrify-ref: baserock/build-essential
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/tiagogomes/update-toolchain
   build-depends:
   - stage1-binutils
   - stage1-gcc
   - stage2-glibc
   - stage2-gcc-fixed-headers
+  - stage2-libstdc++
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-busybox
   morph: strata/build-essential/stage2-busybox.morph
   repo: upstream:busybox
@@ -121,6 +141,7 @@ chunks:
   - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-fake-bash
   morph: strata/build-essential/stage2-fake-bash.morph
   repo: upstream:bash
@@ -129,6 +150,7 @@ chunks:
   build-depends: []
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-fhs-dirs
   morph: strata/build-essential/stage2-fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
@@ -137,6 +159,7 @@ chunks:
   build-depends: []
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-gawk
   morph: strata/build-essential/stage2-gawk.morph
   repo: upstream:gawk
@@ -148,6 +171,7 @@ chunks:
   - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-make
   morph: strata/build-essential/stage2-make.morph
   repo: upstream:make
@@ -159,6 +183,7 @@ chunks:
   - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
+
 - name: stage2-reset-specs
   morph: strata/build-essential/stage2-reset-specs.morph
   repo: upstream:glibc
@@ -171,6 +196,7 @@ chunks:
   - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
+
 - name: fhs-dirs
   morph: strata/build-essential/fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
@@ -186,6 +212,7 @@ chunks:
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
+
 - name: linux-api-headers
   morph: strata/build-essential/linux-api-headers.morph
   repo: upstream:linux
@@ -201,6 +228,7 @@ chunks:
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
+
 - name: glibc
   morph: strata/build-essential/glibc.morph
   repo: upstream:glibc
@@ -222,6 +250,7 @@ chunks:
     glibc-gconv: build-essential-runtime
     glibc-libs: build-essential-minimal
     glibc-nss: build-essential-runtime
+
 - name: zlib
   morph: strata/build-essential/zlib.morph
   repo: upstream:zlib
@@ -240,11 +269,12 @@ chunks:
   - glibc
   artifacts:
     zlib-libs: build-essential-minimal
+
 - name: binutils
   morph: strata/build-essential/binutils.morph
   repo: upstream:binutils-redhat
-  ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
-  unpetrify-ref: baserock/build-essential
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
+  unpetrify-ref: baserock/tiagogomes/update-toolchain
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -257,6 +287,7 @@ chunks:
   - stage2-reset-specs
   - glibc
   - zlib
+
 - name: busybox
   morph: strata/build-essential/busybox.morph
   repo: upstream:busybox
@@ -273,6 +304,7 @@ chunks:
   - stage2-make
   - stage2-reset-specs
   - glibc
+
 - name: gawk
   morph: strata/build-essential/gawk.morph
   repo: upstream:gawk
@@ -289,11 +321,27 @@ chunks:
   - stage2-make
   - stage2-reset-specs
   - glibc
+
+- name: m4
+  morph: strata/build-essential/m4.morph
+  repo: upstream:m4
+  ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db
+  unpetrify-ref: baserock/build-essential
+  build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-glibc
+  - stage2-fhs-dirs
+  - stage2-gcc
+  - stage2-make
+  - stage2-reset-specs
+  - glibc
+
 - name: gcc
   morph: strata/build-essential/gcc.morph
   repo: upstream:gcc-tarball
-  ref: 5c08cea34d5562dc828b85c7c02519246823aaf0
-  unpetrify-ref: baserock/build-essential-4.7
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/tiagogomes/update-toolchain
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -306,8 +354,10 @@ chunks:
   - stage2-reset-specs
   - glibc
   - zlib
+  - m4
   artifacts:
     gcc-libs: build-essential-minimal
+
 - name: make
   morph: strata/build-essential/make.morph
   repo: upstream:make
@@ -324,6 +374,7 @@ chunks:
   - stage2-make
   - stage2-reset-specs
   - glibc
+
 - name: ccache
   morph: strata/build-essential/ccache.morph
   repo: upstream:ccache