瀏覽代碼

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.
Matthias Schiffer 8 年之前
父節點
當前提交
19f248c755
共有 1 個文件被更改,包括 5 次插入2 次删除
  1. 5 2
      Makefile

+ 5 - 2
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)