From 19f248c7551b351cee2bf33a755afbd0b7b9122c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 2 Apr 2016 04:31:50 +0200 Subject: [PATCH] build: ensure the early path doesn't leak into later build steps Leads to broken symlink setup by OpenWrt, usually breaking the build with a "Too many levels of symbolic links" message. Fixes #716. --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e71f2be4..88fc8345 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,14 @@ export LC_ALL LANG export SHELL:=/usr/bin/env bash +GLUONPATH ?= $(PATH) +export GLUONPATH := $(GLUONPATH) + empty:= space:= $(empty) $(empty) -GLUONMAKE_EARLY = $(SUBMAKE) -C $(GLUON_ORIGOPENWRTDIR) -f $(GLUONDIR)/Makefile GLUON_TOOLS=0 QUILT= -GLUONMAKE = $(SUBMAKE) -C $(GLUON_OPENWRTDIR) -f $(GLUONDIR)/Makefile +GLUONMAKE_EARLY = PATH=$(GLUONPATH) $(SUBMAKE) -C $(GLUON_ORIGOPENWRTDIR) -f $(GLUONDIR)/Makefile GLUON_TOOLS=0 QUILT= +GLUONMAKE = PATH=$(GLUONPATH) $(SUBMAKE) -C $(GLUON_OPENWRTDIR) -f $(GLUONDIR)/Makefile ifneq ($(OPENWRT_BUILD),1)