mirror of
https://github.com/monero-project/monero.git
synced 2024-10-30 04:57:36 +00:00
Merge pull request #9005
0d763a1
depends: move cmake system config to hosts files (tobtoht)
This commit is contained in:
commit
92a3b2c97e
7 changed files with 10 additions and 17 deletions
|
@ -68,21 +68,6 @@ $(host_arch)_$(host_os)_prefix=$(BASEDIR)/$(host)
|
||||||
$(host_arch)_$(host_os)_host=$(host)
|
$(host_arch)_$(host_os)_host=$(host)
|
||||||
host_prefix=$($(host_arch)_$(host_os)_prefix)
|
host_prefix=$($(host_arch)_$(host_os)_prefix)
|
||||||
build_prefix=$(host_prefix)/native
|
build_prefix=$(host_prefix)/native
|
||||||
ifeq ($(host_os),mingw32)
|
|
||||||
host_cmake=Windows
|
|
||||||
endif
|
|
||||||
ifeq ($(host_os),linux)
|
|
||||||
host_cmake=Linux
|
|
||||||
endif
|
|
||||||
ifeq ($(host_os),freebsd)
|
|
||||||
host_cmake=FreeBSD
|
|
||||||
endif
|
|
||||||
ifeq ($(host_os),darwin)
|
|
||||||
host_cmake=Darwin
|
|
||||||
endif
|
|
||||||
ifeq ($(host_os),android)
|
|
||||||
host_cmake=Android
|
|
||||||
endif
|
|
||||||
|
|
||||||
AT_$(V):=
|
AT_$(V):=
|
||||||
AT_:=@
|
AT_:=@
|
||||||
|
@ -151,7 +136,7 @@ $(host_prefix)/share/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_
|
||||||
-e 's|@debug@|$(DEBUG)|' \
|
-e 's|@debug@|$(DEBUG)|' \
|
||||||
-e 's|@release_type@|$(release_type)|' \
|
-e 's|@release_type@|$(release_type)|' \
|
||||||
-e 's|@build_tests@|$(build_tests)|' \
|
-e 's|@build_tests@|$(build_tests)|' \
|
||||||
-e 's|@depends@|$(host_cmake)|' \
|
-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)|'\
|
||||||
-e 's|@arch@|$(host_arch)|'\
|
-e 's|@arch@|$(host_arch)|'\
|
||||||
$< > $@
|
$< > $@
|
||||||
|
|
|
@ -20,3 +20,4 @@ android_debug_CXXFLAGS=$(android_debug_CFLAGS)
|
||||||
|
|
||||||
android_native_toolchain=android_ndk
|
android_native_toolchain=android_ndk
|
||||||
|
|
||||||
|
android_cmake_system=Android
|
||||||
|
|
|
@ -19,3 +19,5 @@ darwin_debug_CFLAGS=-O1
|
||||||
darwin_debug_CXXFLAGS=$(darwin_debug_CFLAGS)
|
darwin_debug_CXXFLAGS=$(darwin_debug_CFLAGS)
|
||||||
|
|
||||||
darwin_native_toolchain=native_cctools darwin_sdk
|
darwin_native_toolchain=native_cctools darwin_sdk
|
||||||
|
|
||||||
|
darwin_cmake_system=Darwin
|
||||||
|
|
|
@ -16,3 +16,4 @@ freebsd_debug_CXXFLAGS=$(freebsd_debug_CFLAGS)
|
||||||
|
|
||||||
freebsd_native_toolchain=freebsd_base
|
freebsd_native_toolchain=freebsd_base
|
||||||
|
|
||||||
|
freebsd_cmake_system=FreeBSD
|
||||||
|
|
|
@ -30,3 +30,5 @@ i686_linux_CXX=$(default_host_CXX) -m32
|
||||||
x86_64_linux_CC=$(default_host_CC) -m64
|
x86_64_linux_CC=$(default_host_CC) -m64
|
||||||
x86_64_linux_CXX=$(default_host_CXX) -m64
|
x86_64_linux_CXX=$(default_host_CXX) -m64
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
linux_cmake_system=Linux
|
||||||
|
|
|
@ -9,3 +9,5 @@ mingw32_debug_CFLAGS=-O1
|
||||||
mingw32_debug_CXXFLAGS=$(mingw32_debug_CFLAGS)
|
mingw32_debug_CXXFLAGS=$(mingw32_debug_CFLAGS)
|
||||||
|
|
||||||
mingw32_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
|
mingw32_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
|
||||||
|
|
||||||
|
mingw32_cmake_system=Windows
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Set the system name to one of Android, Darwin, FreeBSD, Linux, or Windows
|
# Set the system name to one of Android, Darwin, FreeBSD, Linux, or Windows
|
||||||
SET(CMAKE_SYSTEM_NAME @depends@)
|
SET(CMAKE_SYSTEM_NAME @cmake_system_name@)
|
||||||
SET(CMAKE_SYSTEM_PROCESSOR @arch@)
|
SET(CMAKE_SYSTEM_PROCESSOR @arch@)
|
||||||
SET(CMAKE_BUILD_TYPE @release_type@)
|
SET(CMAKE_BUILD_TYPE @release_type@)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue