StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove architecture name from names of HOST_*.mk files." into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-26 21:15:42 +00:00
committed by Gerrit Code Review
parent 596d514744 fc478d2926
commit 1741facdbf
4 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/combo/HOST_darwin-x86_64.mk → core/combo/HOST_darwin.mk
View File

@@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
# Configuration for Darwin (Mac OS X) on x86_64. # Configuration for Darwin (Mac OS X).
# Included by combo/select.mk # Included by combo/select.mk
define $(combo_var_prefix)transform-shared-lib-to-toc define $(combo_var_prefix)transform-shared-lib-to-toc

22
core/combo/HOST_linux-x86_64.mk
View File

@@ -1,22 +0,0 @@
#
# Copyright (C) 2006 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Configuration for builds hosted on linux-x86_64.
# Included by combo/select.mk
define $(combo_var_prefix)transform-shared-lib-to-toc
$(call _gen_toc_command_for_elf,$(1),$(2))
endef

2
core/combo/HOST_linux-x86.mk → core/combo/HOST_linux.mk
View File

@@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
# Configuration for builds hosted on linux-x86. # Configuration for builds hosted on linux.
# Included by combo/select.mk # Included by combo/select.mk
define $(combo_var_prefix)transform-shared-lib-to-toc define $(combo_var_prefix)transform-shared-lib-to-toc

8
core/combo/select.mk
View File

@@ -21,8 +21,12 @@
# combo_2nd_arch_prefix -- it's defined if this is loaded for the 2nd arch. # combo_2nd_arch_prefix -- it's defined if this is loaded for the 2nd arch.
# #
# Build a target string like "linux-arm" or "darwin-x86". ifeq ($(combo_target),HOST_)
combo_os_arch := $($(combo_target)OS)-$($(combo_target)$(combo_2nd_arch_prefix)ARCH) combo_os_arch := $(HOST_OS)
else
# Build a target string like "linux-arm" or "darwin-x86".
combo_os_arch := $($(combo_target)OS)-$($(combo_target)$(combo_2nd_arch_prefix)ARCH)
endif
combo_var_prefix := $(combo_2nd_arch_prefix)$(combo_target) combo_var_prefix := $(combo_2nd_arch_prefix)$(combo_target)