summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2017-07-05 18:55:38 +0100
committerJavier Jardón <jjardon@gnome.org>2017-07-05 18:55:38 +0100
commit4256bfb5a7728fd515d10c68df462a0e315e4db9 (patch)
treeb567f6acb653938481aa0e543132500275c5044e
parente214eed4fcda9c2c679c69babde81bf557121aa1 (diff)
downloaddefinitions-4256bfb5a7728fd515d10c68df462a0e315e4db9.tar.gz
Revert "Update to GCC 7.1 for stage1 and stage2 bootstrap"
This was merged but without passing the whole CI; current CI is broken atm because this change (we need to upgrade several old chunks first) This reverts commit 64813d0134a7796f9de9a98ebe2410d97680d51a.
-rw-r--r--strata/build-essential.morph16
-rw-r--r--strata/build-essential/stage1-gcc.morph1
2 files changed, 8 insertions, 9 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 1b34773e..e56d7579 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -59,8 +59,8 @@ chunks:
- name: stage1-gcc
morph: strata/build-essential/stage1-gcc.morph
repo: upstream:gcc-tarball
- ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838
- unpetrify-ref: baserock/gcc-7.1.0
+ ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+ unpetrify-ref: baserock/gcc-5.3.0
build-depends:
- stage1-binutils
build-mode: bootstrap
@@ -92,8 +92,8 @@ chunks:
- name: stage2-libstdc++
morph: strata/build-essential/stage2-libstdc++.morph
repo: upstream:gcc-tarball
- ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838
- unpetrify-ref: baserock/gcc-7.1.0
+ ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+ unpetrify-ref: baserock/gcc-5.3.0
build-depends:
- stage1-binutils
- stage1-gcc
@@ -118,8 +118,8 @@ chunks:
- name: stage2-gcc-fixed-headers
morph: strata/build-essential/stage2-gcc-fixed-headers.morph
repo: upstream:gcc-tarball
- ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838
- unpetrify-ref: baserock/gcc-7.1.0
+ ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+ unpetrify-ref: baserock/gcc-5.3.0
build-depends:
- stage1-binutils
- stage1-gcc
@@ -131,8 +131,8 @@ chunks:
- name: stage2-gcc
morph: strata/build-essential/stage2-gcc.morph
repo: upstream:gcc-tarball
- ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838
- unpetrify-ref: baserock/gcc-7.1.0
+ ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+ unpetrify-ref: baserock/gcc-5.3.0
build-depends:
- stage1-binutils
- stage1-gcc
diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph
index f5d828f7..175cfdee 100644
--- a/strata/build-essential/stage1-gcc.morph
+++ b/strata/build-essential/stage1-gcc.morph
@@ -54,7 +54,6 @@ configure-commands:
`# [5]` --disable-libatomic \
`# [5]` --disable-libgomp \
`# [5]` --disable-libitm \
- `# [5]` --disable-libmpx \
`# [5]` --disable-libquadmath \
`# [5]` --disable-libsanitizer \
`# [5]` --disable-libssp \