diff options
| author | Carl Dong <contact@carldong.me> | 2020-08-07 20:53:39 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2020-08-07 20:53:42 -0400 |
| commit | 8c7cd0c6d9f295bcb6913e3c69c9dac4ce2b25ce (patch) | |
| tree | 96f211cc537b1b6b95a4ec34bf8766ce71b64565 /depends/funcs.mk | |
| parent | 3ecf0eca634601da216b06f091f95456c047f39c (diff) | |
| download | bitcoin-8c7cd0c6d9f295bcb6913e3c69c9dac4ce2b25ce.tar.xz | |
depends: More robust cmake invocation
Specify well-known env vars instead of using a workaround to split up CC
and CXX.
Diffstat (limited to 'depends/funcs.mk')
| -rw-r--r-- | depends/funcs.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/depends/funcs.mk b/depends/funcs.mk index 6fc20543bb..45f9603b44 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -157,12 +157,12 @@ ifneq ($($(1)_ldflags),) $(1)_autoconf += LDFLAGS="$$($(1)_ldflags)" endif -$(1)_cmake=cmake -DCMAKE_INSTALL_PREFIX=$($($(1)_type)_prefix) +$(1)_cmake=env CC="$$($(1)_cc)" CXX="$$($(1)_cxx)" CFLAGS="$$($(1)_cflags)" CXXFLAGS="$$($(1)_cxxflags)" cmake -DCMAKE_INSTALL_PREFIX:PATH=$($($(1)_type)_prefix) ifneq ($($(1)_type),build) ifneq ($(host),$(build)) -$(1)_cmake += -DCMAKE_SYSTEM_NAME=$($(host_os)_cmake_system) -DCMAKE_SYSROOT=$(host_prefix) -$(1)_cmake += -DCMAKE_C_COMPILER_TARGET=$(host) -DCMAKE_C_COMPILER=$(firstword $($($(1)_type)_CC)) -DCMAKE_C_FLAGS="$(wordlist 2,1000,$($($(1)_type)_CC))" -$(1)_cmake += -DCMAKE_CXX_COMPILER_TARGET=$(host) -DCMAKE_CXX_COMPILER=$(firstword $($($(1)_type)_CXX)) -DCMAKE_CXX_FLAGS="$(wordlist 2,1000,$($($(1)_type)_CXX))" +$(1)_cmake += -DCMAKE_SYSTEM_NAME=$($(host_os)_cmake_system) +$(1)_cmake += -DCMAKE_C_COMPILER_TARGET=$(host) +$(1)_cmake += -DCMAKE_CXX_COMPILER_TARGET=$(host) endif endif endef |