From a90c4265bf325dcc5c2164e0947a08c42256064a Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 19 Jul 2021 15:02:08 +0000 Subject: [PATCH] profiles: move BOOSTRAP_USE=cros_host to arch indepenent part of sdk profile So that it can apply to both arm64 and amd64 sdk profiles. Signed-off-by: Jeremi Piotrowski --- .../coreos-overlay/profiles/coreos/amd64/sdk/make.defaults | 4 ---- .../coreos-overlay/profiles/coreos/targets/sdk/make.defaults | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) 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 3d3db02e02..254f8753a5 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,7 +1,3 @@ # 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" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults index 84da663059..9577fb9179 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults @@ -18,3 +18,7 @@ QEMU_USER_TARGETS="aarch64" # Disable ccache in the SDK so it stops randomly breaking catalyst. FEATURES="-ccache" + +# 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"