From 18075553ffe57be314b9f4804a56055acfdb3b48 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Thu, 4 Jul 2019 18:29:40 +0100 Subject: C and Fortran compiler environment set in high-level.mk Until now, we weren't explicitly setting the C and Fortran compiler environment variables (`CC' and `F77'). As a result, if the user's system had already set them, there would be a problem (and the system's compilers would be used). With this commit, we are explicitly setting these two environment variables at the start of `high-level.mk'. This bug was found after a discussion with Elham Saremi. --- .file-metadata | Bin 6236 -> 6236 bytes reproduce/software/make/high-level.mk | 2 ++ 2 files changed, 2 insertions(+) diff --git a/.file-metadata b/.file-metadata index 0411382..551ee79 100644 Binary files a/.file-metadata and b/.file-metadata differ diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 90fc060..3cf3fb9 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -68,8 +68,10 @@ all: $(foreach p, $(top-level-programs), $(ibidir)/$(p)) \ .SHELLFLAGS := --noprofile --norc -ec export CCACHE_DISABLE := 1 export PATH := $(ibdir) +export CC := $(ibdir)/gcc export SHELL := $(ibdir)/bash export CPPFLAGS := -I$(idir)/include +export F77 := $(ibdir)/gfortran export PKG_CONFIG_PATH := $(ildir)/pkgconfig export PKG_CONFIG_LIBDIR := $(ildir)/pkgconfig export LD_RUN_PATH := $(ildir):$(il64dir) -- cgit v1.2.1