aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-07-27 11:44:13 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-07-27 11:44:13 +0100
commit8847155563e25aa70663413f6a8dc9657ca79993 (patch)
treefe89e7044aeaac7f597bc6fd5b96af1ed528401b /reproduce/software
parent33820ab02bd39faa10fe634dfd0de85764e1e96e (diff)
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.
Diffstat (limited to 'reproduce/software')
-rw-r--r--reproduce/software/make/basic.mk13
-rw-r--r--reproduce/software/make/high-level.mk21
2 files changed, 18 insertions, 16 deletions
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
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index a953ca5..dee23ca 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -65,17 +65,18 @@ all: $(foreach p, $(top-level-programs), $(ibidir)/$(p)) \
# 2) Add `--noprofile --norc' to `.SHELLFLAGS' so doesn't load the
# user's environment.
.ONESHELL:
-.SHELLFLAGS := --noprofile --norc -ec
-export CCACHE_DISABLE := 1
-export PATH := $(ibdir)
-export CXX := $(ibdir)/g++
-export CC := $(ibdir)/gcc
-export SHELL := $(ibdir)/bash
-export F77 := $(ibdir)/gfortran
-export PKG_CONFIG_PATH := $(ildir)/pkgconfig
+.SHELLFLAGS := --noprofile --norc -ec
+export CCACHE_DISABLE := 1
+export PATH := $(ibdir)
+export CXX := $(ibdir)/g++
+export CC := $(ibdir)/gcc
+export SHELL := $(ibdir)/bash
+export F77 := $(ibdir)/gfortran
+export LD_RUN_PATH := $(ildir):$(il64dir)
+export PKG_CONFIG_PATH := $(ildir)/pkgconfig
+export LD_LIBRARY_PATH := $(ildir):$(il64dir)
export PKG_CONFIG_LIBDIR := $(ildir)/pkgconfig
-export LD_RUN_PATH := $(ildir):$(il64dir)
-export LD_LIBRARY_PATH := $(ildir):$(il64dir)
+export DYLD_LIBRARY_PATH := $(ildir):$(il64dir)
# Building flags:
#