mirror of
https://github.com/monero-project/monero.git
synced 2025-01-19 16:13:40 +02:00
depends: remove archiver flags
This commit is contained in:
parent
941ecefab2
commit
62b14d8d66
@ -17,4 +17,4 @@ define add_build_flags_func
|
|||||||
build_$(build_arch)_$(build_os)_$1 += $(build_$(build_os)_$1)
|
build_$(build_arch)_$(build_os)_$1 += $(build_$(build_os)_$1)
|
||||||
build_$1=$$(build_$(build_arch)_$(build_os)_$1)
|
build_$1=$$(build_$(build_arch)_$(build_os)_$1)
|
||||||
endef
|
endef
|
||||||
$(foreach flags, CFLAGS CXXFLAGS ARFLAGS LDFLAGS, $(eval $(call add_build_flags_func,$(flags))))
|
$(foreach flags, CFLAGS CXXFLAGS LDFLAGS, $(eval $(call add_build_flags_func,$(flags))))
|
||||||
|
@ -12,8 +12,6 @@ $(1)_cflags=$$($$($(1)_type)_CFLAGS) \
|
|||||||
$$($$($(1)_type)_$$(release_type)_CFLAGS)
|
$$($$($(1)_type)_$$(release_type)_CFLAGS)
|
||||||
$(1)_cxxflags=$$($$($(1)_type)_CXXFLAGS) \
|
$(1)_cxxflags=$$($$($(1)_type)_CXXFLAGS) \
|
||||||
$$($$($(1)_type)_$$(release_type)_CXXFLAGS)
|
$$($$($(1)_type)_$$(release_type)_CXXFLAGS)
|
||||||
$(1)_arflags=$$($$($(1)_type)_ARFLAGS) \
|
|
||||||
$$($$($(1)_type)_$(release_type)_ARFLAGS)
|
|
||||||
$(1)_ldflags=$$($$($(1)_type)_LDFLAGS) \
|
$(1)_ldflags=$$($$($(1)_type)_LDFLAGS) \
|
||||||
$$($$($(1)_type)_$$(release_type)_LDFLAGS) \
|
$$($$($(1)_type)_$$(release_type)_LDFLAGS) \
|
||||||
-L$$($($(1)_type)_prefix)/lib
|
-L$$($($(1)_type)_prefix)/lib
|
||||||
@ -111,11 +109,6 @@ $(1)_cxxflags+=$($(1)_cxxflags_$(host_arch)) $($(1)_cxxflags_$(host_arch)_$(rele
|
|||||||
$(1)_cxxflags+=$($(1)_cxxflags_$(host_os)) $($(1)_cxxflags_$(host_os)_$(release_type))
|
$(1)_cxxflags+=$($(1)_cxxflags_$(host_os)) $($(1)_cxxflags_$(host_os)_$(release_type))
|
||||||
$(1)_cxxflags+=$($(1)_cxxflags_$(host_arch)_$(host_os)) $($(1)_cxxflags_$(host_arch)_$(host_os)_$(release_type))
|
$(1)_cxxflags+=$($(1)_cxxflags_$(host_arch)_$(host_os)) $($(1)_cxxflags_$(host_arch)_$(host_os)_$(release_type))
|
||||||
|
|
||||||
$(1)_arflags+=$($(1)_arflags_$(release_type))
|
|
||||||
$(1)_arflags+=$($(1)_arflags_$(host_arch)) $($(1)_arflags_$(host_arch)_$(release_type))
|
|
||||||
$(1)_arflags+=$($(1)_arflags_$(host_os)) $($(1)_arflags_$(host_os)_$(release_type))
|
|
||||||
$(1)_arflags+=$($(1)_arflags_$(host_arch)_$(host_os)) $($(1)_arflags_$(host_arch)_$(host_os)_$(release_type))
|
|
||||||
|
|
||||||
$(1)_cppflags+=$($(1)_cppflags_$(release_type))
|
$(1)_cppflags+=$($(1)_cppflags_$(release_type))
|
||||||
$(1)_cppflags+=$($(1)_cppflags_$(host_arch)) $($(1)_cppflags_$(host_arch)_$(release_type))
|
$(1)_cppflags+=$($(1)_cppflags_$(host_arch)) $($(1)_cppflags_$(host_arch)_$(release_type))
|
||||||
$(1)_cppflags+=$($(1)_cppflags_$(host_os)) $($(1)_cppflags_$(host_os)_$(release_type))
|
$(1)_cppflags+=$($(1)_cppflags_$(host_os)) $($(1)_cppflags_$(host_os)_$(release_type))
|
||||||
@ -170,9 +163,6 @@ endif
|
|||||||
ifneq ($($(1)_ar),)
|
ifneq ($($(1)_ar),)
|
||||||
$(1)_autoconf += AR="$$($(1)_ar)"
|
$(1)_autoconf += AR="$$($(1)_ar)"
|
||||||
endif
|
endif
|
||||||
ifneq ($($(1)_arflags),)
|
|
||||||
$(1)_autoconf += ARFLAGS="$$($(1)_arflags)"
|
|
||||||
endif
|
|
||||||
ifneq ($($(1)_cflags),)
|
ifneq ($($(1)_cflags),)
|
||||||
$(1)_autoconf += CFLAGS="$$($(1)_cflags)"
|
$(1)_autoconf += CFLAGS="$$($(1)_cflags)"
|
||||||
endif
|
endif
|
||||||
|
@ -10,7 +10,6 @@ android_RANLIB=:
|
|||||||
|
|
||||||
android_CFLAGS=-pipe
|
android_CFLAGS=-pipe
|
||||||
android_CXXFLAGS=$(android_CFLAGS)
|
android_CXXFLAGS=$(android_CFLAGS)
|
||||||
android_ARFLAGS=crsD
|
|
||||||
|
|
||||||
android_release_CFLAGS=-O2
|
android_release_CFLAGS=-O2
|
||||||
android_release_CXXFLAGS=$(android_release_CFLAGS)
|
android_release_CXXFLAGS=$(android_release_CFLAGS)
|
||||||
|
@ -54,7 +54,6 @@ darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
|
|||||||
|
|
||||||
darwin_CFLAGS=-pipe
|
darwin_CFLAGS=-pipe
|
||||||
darwin_CXXFLAGS=$(darwin_CFLAGS)
|
darwin_CXXFLAGS=$(darwin_CFLAGS)
|
||||||
darwin_ARFLAGS=cr
|
|
||||||
|
|
||||||
darwin_release_CFLAGS=-O2
|
darwin_release_CFLAGS=-O2
|
||||||
darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
|
darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
|
||||||
|
@ -15,7 +15,6 @@ freebsd_NM=nm
|
|||||||
|
|
||||||
freebsd_CFLAGS=-pipe
|
freebsd_CFLAGS=-pipe
|
||||||
freebsd_CXXFLAGS=$(freebsd_CFLAGS)
|
freebsd_CXXFLAGS=$(freebsd_CFLAGS)
|
||||||
freebsd_ARFLAGS=cr
|
|
||||||
|
|
||||||
freebsd_release_CFLAGS=-O2
|
freebsd_release_CFLAGS=-O2
|
||||||
freebsd_release_CXXFLAGS=$(freebsd_release_CFLAGS)
|
freebsd_release_CXXFLAGS=$(freebsd_release_CFLAGS)
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
linux_CFLAGS=-pipe
|
linux_CFLAGS=-pipe
|
||||||
linux_CXXFLAGS=$(linux_CFLAGS)
|
linux_CXXFLAGS=$(linux_CFLAGS)
|
||||||
linux_ARFLAGS=cr
|
|
||||||
|
|
||||||
linux_release_CFLAGS=-O2
|
linux_release_CFLAGS=-O2
|
||||||
linux_release_CXXFLAGS=$(linux_release_CFLAGS)
|
linux_release_CXXFLAGS=$(linux_release_CFLAGS)
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
mingw32_CFLAGS=-pipe
|
mingw32_CFLAGS=-pipe
|
||||||
mingw32_CXXFLAGS=$(mingw32_CFLAGS)
|
mingw32_CXXFLAGS=$(mingw32_CFLAGS)
|
||||||
mingw32_ARFLAGS=cr
|
|
||||||
|
|
||||||
mingw32_release_CFLAGS=-O2
|
mingw32_release_CFLAGS=-O2
|
||||||
mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)
|
mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)
|
||||||
|
@ -9,7 +9,7 @@ define $(package)_set_vars
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
|
$($(package)_autoconf)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmd
|
define $(package)_build_cmd
|
||||||
|
@ -21,7 +21,7 @@ define $(package)_preprocess_cmds
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
|
$($(package)_autoconf)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
|
@ -18,7 +18,7 @@ define $(package)_set_vars
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
|
$($(package)_autoconf)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmd
|
define $(package)_build_cmd
|
||||||
|
@ -13,7 +13,7 @@ define $(package)_set_vars
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
|
$($(package)_autoconf)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
|
@ -17,7 +17,7 @@ define $(package)_preprocess_cmds
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
|
$($(package)_autoconf)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
|
@ -24,7 +24,7 @@ define $(package)_preprocess_cmds
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
$($(package)_autoconf) ac_cv_func_getentropy=no AR_FLAGS=$($(package)_arflags)
|
$($(package)_autoconf) ac_cv_func_getentropy=no
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
|
@ -12,7 +12,7 @@ define $(package)_set_vars
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
$($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
|
$($(package)_autoconf)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
|
Loading…
Reference in New Issue
Block a user