diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 20:46:20 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 20:46:20 +0000 |
commit | fba8749019de168afa4b8ea20b6541fb4b4c6a89 (patch) | |
tree | 45a04ecf13a87f6267b20afb71eb3de6743d8ec9 /include | |
parent | d446426dad6738dc010b8a1dbdf11737bc3a0931 (diff) | |
download | master-187ad058-fba8749019de168afa4b8ea20b6541fb4b4c6a89.tar.gz master-187ad058-fba8749019de168afa4b8ea20b6541fb4b4c6a89.tar.bz2 master-187ad058-fba8749019de168afa4b8ea20b6541fb4b4c6a89.zip |
Revert "include/autoconf.mk: decouple host fixups from target fixups"
This reverts commit r48403
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48412 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r-- | include/autotools.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index 3e028fa72d..3316998dc9 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -143,21 +143,27 @@ define patch_libtool_host $(HOST_BUILD_DIR))) endef -ifneq ($(filter patch-libtool-host,$(PKG_FIXUP)),) +ifneq ($(filter patch-libtool,$(PKG_FIXUP)),) Hooks/HostConfigure/Pre += patch_libtool_host endif -ifneq ($(filter patch-libtool-host,$(HOST_FIXUP)),) +ifneq ($(filter patch-libtool,$(HOST_FIXUP)),) Hooks/HostConfigure/Pre += $(strip $(call patch_libtool,$(HOST_BUILD_DIR))) endif -ifneq ($(filter libtool-host,$(HOST_FIXUP)),) +ifneq ($(filter libtool,$(HOST_FIXUP)),) + ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),) + Hooks/HostConfigure/Pre += autoreconf_host + endif +endif + +ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),) ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),) Hooks/HostConfigure/Pre += autoreconf_host endif endif -ifneq ($(filter autoreconf-host,$(HOST_FIXUP)),) +ifneq ($(filter autoreconf,$(HOST_FIXUP)),) ifeq ($(filter autoreconf,$(Hooks/HostConfigure/Pre)),) Hooks/HostConfigure/Pre += autoreconf_host endif |