From b5a49ad43f275dde864d429b3765156367bd8f8c Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Wed, 28 Nov 2018 15:45:50 +0000 Subject: Changed -rpath to -rpath-link for LLVM The linker of LLVM version 10.0.0 (clang-1000.11.45.5) doesn't recognize the `-rpath' linker option! After some searching, apparently it does recognize `-rpath-link' so we are testing with that now. --- reproduce/src/make/dependencies-basic.mk | 5 +++++ reproduce/src/make/dependencies.mk | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index 196d457..c1e227b 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -145,6 +145,11 @@ $(tarballs): $(tdir)/%: $(DOWNLOADER) $@ $$tarballurl; \ fi +# C compiler and linker +# --------------------- +# +# --disable-multilib: ignore 32-bit installation for 64-bit systems. + diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index 6f4aa78..396060b 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -53,12 +53,13 @@ all: $(foreach p, $(top-level-programs), $(ibdir)/$(p)) .ONESHELL: .SHELLFLAGS := -ec export PATH := $(ibdir) +export LD_RUN_PATH := $(ildir) export LD_LIBRARY_PATH := $(ildir) export SHELL := $(ibdir)/bash export CPPFLAGS := -I$(idir)/include export PKG_CONFIG_PATH := $(ildir)/pkgconfig export PKG_CONFIG_LIBDIR := $(ildir)/pkgconfig -export LDFLAGS := -Wl,-rpath=$(ildir) -L$(ildir) +export LDFLAGS := -Wl,-rpath-link=$(ildir) -L$(ildir) -- cgit v1.2.1