aboutsummaryrefslogtreecommitdiff
path: root/reproduce
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2018-11-20 12:10:33 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2018-11-20 12:10:33 +0000
commitbcf45125dfb8c7940bfff9a95ca7ba87bb961b7b (patch)
tree6d0d71b1afa1052ee518fac7a256307952881d45 /reproduce
parent016b8f3b567e9af1125361520fe609f009c814c9 (diff)
Not including system's libraries in high-level dependencies
The system's libraries are no longer used in building the higher-level dependencies. Also, thanks to Raul Infante Sainz, we found out that Bash's build script was still removing the extra directory information (not good!).
Diffstat (limited to 'reproduce')
-rw-r--r--reproduce/src/make/dependencies-basic.mk2
-rw-r--r--reproduce/src/make/dependencies.mk11
2 files changed, 8 insertions, 5 deletions
diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index 2cc4327..2102338 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -217,7 +217,7 @@ $(ibdir)/bash: $(tdir)/bash-$(bash-version).tar.gz \
ifeq ($(static_build),yes)
$(call gbuild, $<, bash-$(bash-version), , --enable-static-link)
else
- $(call gbuild,$(subst $(tdir)/,,$<), bash-$(bash-version))
+ $(call gbuild, $<, bash-$(bash-version))
endif
diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk
index e1b601f..768bafb 100644
--- a/reproduce/src/make/dependencies.mk
+++ b/reproduce/src/make/dependencies.mk
@@ -46,14 +46,17 @@ ilidir = $(BDIR)/dependencies/installed/lib/built
top-level-programs = gawk gs grep sed git astnoisechisel texlive-ready
all: $(foreach p, $(top-level-programs), $(ibdir)/$(p))
-# Other basic environment settings.
+# Other basic environment settings: We are only including the host
+# operating system's PATH environment variable (after our own!) for the
+# compiler and linker. For the library binaries and headers, we are only
+# using our internally built libraries.
.ONESHELL:
.SHELLFLAGS := -ec
SHELL := $(ibdir)/bash
PATH := $(ibdir):$(PATH)
-LDFLAGS := -L$(ildir) $(LDFLAGS)
-CPPFLAGS := -I$(idir)/include $(CPPFLAGS)
-LD_LIBRARY_PATH := $(ildir):$(LD_LIBRARY_PATH)
+LDFLAGS := -L$(ildir)
+CPPFLAGS := -I$(idir)/include
+LD_LIBRARY_PATH := $(ildir)