commit: ea82a280fecc5544030f216754254f7cc6ad0428
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 01:52:04 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 01:52:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=ea82a280
Fix CHOST.
core/etc/portage/make.conf.CYCLE.1 | 2 +-
core/etc/portage/make.conf.CYCLE.2 | 2 +-
core/etc/portage/make.conf.CYCLE.3 | 2 +-
scripts/cycle.1.sh | 6 +++++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/etc/portage/make.conf.CYCLE.1
b/core/etc/portage/make.conf.CYCLE.1
index e7c9b65..02a940d 100644
--- a/core/etc/portage/make.conf.CYCLE.1
+++ b/core/etc/portage/make.conf.CYCLE.1
@@ -1,6 +1,6 @@
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-pc-linux-gnu"
+CHOST="x86_64-pc-linux-gnux32"
ABI_X86="64 32 x32"
MAKEOPTS="-j17"
diff --git a/core/etc/portage/make.conf.CYCLE.2
b/core/etc/portage/make.conf.CYCLE.2
index dc9e75d..4a8b868 100644
--- a/core/etc/portage/make.conf.CYCLE.2
+++ b/core/etc/portage/make.conf.CYCLE.2
@@ -1,6 +1,6 @@
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-pc-linux-gnu"
+CHOST="x86_64-pc-linux-gnux32"
ABI_X86="64 32 x32"
MAKEOPTS="-j17"
diff --git a/core/etc/portage/make.conf.CYCLE.3
b/core/etc/portage/make.conf.CYCLE.3
index f5e5640..f82cf43 100644
--- a/core/etc/portage/make.conf.CYCLE.3
+++ b/core/etc/portage/make.conf.CYCLE.3
@@ -1,6 +1,6 @@
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-pc-linux-gnu"
+CHOST="x86_64-pc-linux-gnux32"
ABI_X86="64 32 x32"
MAKEOPTS="-j17"
diff --git a/scripts/cycle.1.sh b/scripts/cycle.1.sh
index 224f746..34f1e3e 100644
--- a/scripts/cycle.1.sh
+++ b/scripts/cycle.1.sh
@@ -2,6 +2,10 @@
source /etc/profile
env-update
-emerge -b1q binutils
+emerge -b1q glibc
emerge -b1q gcc
+
+# Double build because we're assuming we're starting for vanilla x32
+emerge -b1q binutils
emerge -b1q glibc
+emerge -b1q gcc
