From e9a822fd0a2039b3e32eb5ca32026af974197573 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Tue, 2 Mar 2021 13:25:07 +0100 Subject: [PATCH] amd64 SDK: add cros_host to BOOTSTRAP_USE This change adds the USE flag cros_host to the SDK's make.default, as part of a larger fix for the SDK bootstrap build. The SDK bootstrap build was broken in stage 1 since package upgrades were allowed to leak into that phase. We now limit stage 1 to only "known good" package ebuilds, which caused downstream breakage from missing flags in the stage 2 SDK bootstrapping. This change fixes that breakage. Signed-off-by: Thilo Fromm --- .../coreos-overlay/profiles/coreos/amd64/sdk/make.defaults | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/make.defaults index 254f8753a5..3d3db02e02 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/make.defaults @@ -1,3 +1,7 @@ # Enable optimizations for common x86_64 CPUs CFLAGS="-O2 -pipe -mtune=generic" CXXFLAGS="${CFLAGS}" + +# add cros_host to bootstrapping USE flags so SDK / toolchains bootstrapping +# will use vim's vimrc instead of baselayouts', +BOOTSTRAP_USE="$BOOTSTRAP_USE cros_host"