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

Merge "Do not force rebuilds after changing host kernel."

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-03 06:19:52 +00:00
committed by Gerrit Code Review
parent e2137bae02 0d06f702dd
commit cecd960ee9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/envsetup.mk
View File

@@ -135,15 +135,17 @@ ifneq (,$(findstring Darwin,$(UNAME)))
HOST_OS := darwin HOST_OS := darwin
endif endif
HOST_OS_EXTRA := $(shell uname -rsm) ifeq ($(CALLED_FROM_SETUP),true)
ifeq ($(HOST_OS),linux) HOST_OS_EXTRA := $(shell uname -rsm)
ifneq ($(wildcard /etc/os-release),) ifeq ($(HOST_OS),linux)
HOST_OS_EXTRA += $(shell source /etc/os-release; echo $$PRETTY_NAME) ifneq ($(wildcard /etc/os-release),)
HOST_OS_EXTRA += $(shell source /etc/os-release; echo $$PRETTY_NAME)
endif
else ifeq ($(HOST_OS),darwin)
HOST_OS_EXTRA += $(shell sw_vers -productVersion)
endif endif
else ifeq ($(HOST_OS),darwin) HOST_OS_EXTRA := $(subst $(space),-,$(HOST_OS_EXTRA))
HOST_OS_EXTRA += $(shell sw_vers -productVersion)
endif endif
HOST_OS_EXTRA := $(subst $(space),-,$(HOST_OS_EXTRA))
# BUILD_OS is the real host doing the build. # BUILD_OS is the real host doing the build.
BUILD_OS := $(HOST_OS) BUILD_OS := $(HOST_OS)