diff options
| -rw-r--r-- | reproduce/analysis/make/initialize.mk | 15 | ||||
| -rw-r--r-- | reproduce/software/make/basic.mk | 13 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 21 |
3 files changed, 26 insertions, 23 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk index d176489..d2b026e 100644 --- a/reproduce/analysis/make/initialize.mk +++ b/reproduce/analysis/make/initialize.mk @@ -108,14 +108,15 @@ curdir := $(shell echo $$(pwd)) # avoid conflicts with existing TeX Live solutions. Later (in `paper.mk'), # we are also going to overwrite `TEXINPUTS' just before `pdflatex'. .ONESHELL: -.SHELLFLAGS = -ec -export TEXINPUTS := -export CCACHE_DISABLE := 1 -export PATH := $(installdir)/bin +.SHELLFLAGS = -ec +export TEXINPUTS := +export CCACHE_DISABLE := 1 +export PATH := $(installdir)/bin +export LDFLAGS := -L$(installdir)/lib +export SHELL := $(installdir)/bin/bash +export CPPFLAGS := -I$(installdir)/include export LD_LIBRARY_PATH := $(installdir)/lib -export LDFLAGS := -L$(installdir)/lib -export SHELL := $(installdir)/bin/bash -export CPPFLAGS := -I$(installdir)/include +export DYLD_LIBRARY_PATH := $(installdir)/lib 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: # |