Merge pull request #9457

e03de80 depends: release type should be lower case (tobtoht)
This commit is contained in:
luigi1111 2024-12-23 10:36:44 -05:00
commit 06be03c438
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -25,18 +25,24 @@ host_toolchain:=$(HOST)-
endif endif
ifneq ($(DEBUG),) ifneq ($(DEBUG),)
release_type=Debug release_type=debug
else else
release_type=Release release_type=release
endif endif
ifneq ($(TESTS),) ifneq ($(TESTS),)
build_tests=ON build_tests=ON
release_type=Debug release_type=debug
else else
build_tests=OFF build_tests=OFF
endif endif
ifeq ($(release_type),debug)
cmake_release_type=Debug
else
cmake_release_type=Release
endif
base_build_dir=$(BASEDIR)/work/build base_build_dir=$(BASEDIR)/work/build
base_staging_dir=$(BASEDIR)/work/staging base_staging_dir=$(BASEDIR)/work/staging
base_download_dir=$(BASEDIR)/work/download base_download_dir=$(BASEDIR)/work/download
@ -143,7 +149,7 @@ $(host_prefix)/share/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \ -e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
-e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \ -e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
-e 's|@debug@|$(DEBUG)|' \ -e 's|@debug@|$(DEBUG)|' \
-e 's|@release_type@|$(release_type)|' \ -e 's|@release_type@|$(cmake_release_type)|' \
-e 's|@build_tests@|$(build_tests)|' \ -e 's|@build_tests@|$(build_tests)|' \
-e 's|@cmake_system_name@|$($(host_os)_cmake_system)|' \ -e 's|@cmake_system_name@|$($(host_os)_cmake_system)|' \
-e 's|@prefix@|$($(host_arch)_$(host_os)_prefix)|'\ -e 's|@prefix@|$($(host_arch)_$(host_os)_prefix)|'\