From 8847155563e25aa70663413f6a8dc9657ca79993 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Sat, 27 Jul 2019 11:44:13 +0100 Subject: DYLD_LIBRARY_PATH also fixed for macOS systems Until now we were only setting the `LD_LIBRARY_PATH' environment variable for GNU/Linux systems. But macOS systems use the `DYLD_LIBRARY_PATH'. With this commit, for better control over the environment, we are also fixing `DYLD_LIBRARY_PATH' in all the places that we are setting the general environment variables. --- reproduce/software/make/basic.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'reproduce/software/make/basic.mk') diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index e544234..bab37ed 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -51,13 +51,14 @@ syspath := $(PATH) # As we build more programs, we want to use this project's built programs # and libraries, not the host's. -export CCACHE_DISABLE := 1 -export PATH := $(ibdir):$(PATH) -export PKG_CONFIG_PATH := $(ildir)/pkgconfig +export CCACHE_DISABLE := 1 +export PATH := $(ibdir):$(PATH) +export PKG_CONFIG_PATH := $(ildir)/pkgconfig export PKG_CONFIG_LIBDIR := $(ildir)/pkgconfig -export LD_LIBRARY_PATH := $(ildir):$(LD_LIBRARY_PATH) -export CPPFLAGS := -I$(idir)/include $(CPPFLAGS) -export LDFLAGS := $(rpath_command) -L$(ildir) $(LDFLAGS) +export CPPFLAGS := -I$(idir)/include $(CPPFLAGS) +export LD_LIBRARY_PATH := $(ildir):$(LD_LIBRARY_PATH) +export LDFLAGS := $(rpath_command) -L$(ildir) $(LDFLAGS) +export DYLD_LIBRARY_PATH := $(ildir):$(DYLD_LIBRARY_PATH) # Define the top-level basic programs (that don't depend on any other). top-level-programs = low-level-links gcc -- cgit v1.2.1