From 95e165c2bc68a92e2d16c12582d00bc01b349813 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 7 Nov 2008 08:57:59 +0000 Subject: [PATCH] Makefile: revert HOST_GLIB_BIN staging_dir fix (r23920,23923) It causes more trouble than it's worth, and we should move to building those host tools ourselves to not get into version issues anyway. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0b27ed1fc7..bd3c7c92eb 100644 --- a/Makefile +++ b/Makefile @@ -122,8 +122,7 @@ HOSTCPP:=$(shell $(CONFIG_SHELL) -c "which $(HOSTCPP)" || type -p $(HOSTCPP) || HOSTLD:=$(shell $(CONFIG_SHELL) -c "which $(HOSTLD)" || type -p $(HOSTLD) || echo ld) HOSTLN:=$(shell $(CONFIG_SHELL) -c "which $(HOSTLN)" || type -p $(HOSTLN) || echo ln) HOSTNM:=$(shell $(CONFIG_SHELL) -c "which $(HOSTNM)" || type -p $(HOSTNM) || echo nm) -# ignore version in staging_dir -HOST_GLIB_BIN:=`dirname $(shell $(CONFIG_SHELL) -c "(which -a glib-genmarshal; echo /usr/bin/glib-genmarshal)|grep -v $(BR2_STAGING_DIR)|head -n 1")` +HOST_GLIB_BIN:=`dirname $(shell $(CONFIG_SHELL) -c "which glib-genmarshal" || echo /usr/bin/glib-genmarshal)` HOST_GLIB:=$(shell $(CONFIG_SHELL) -c "dirname $(HOST_GLIB_BIN)" || echo /usr) -- 2.30.2