diff options
| author | Jan Niklas Hasse <jhasse@gmail.com> | 2014-01-07 17:51:15 +0100 |
|---|---|---|
| committer | Jan Niklas Hasse <jhasse@gmail.com> | 2014-01-07 17:51:15 +0100 |
| commit | 116773a4eb63c6e595d35d228513cddb1adf4053 (patch) | |
| tree | c3ac0ec595e80d8c12181a00689e9e4567784618 /Makefile.in | |
| parent | 7b7d7a041a4f64589b63cd4e62267558bb51219b (diff) | |
| download | rust-116773a4eb63c6e595d35d228513cddb1adf4053.tar.gz rust-116773a4eb63c6e595d35d228513cddb1adf4053.zip | |
Make CFG_LIBDIR configurable. Fixes #5223
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index be1d0fc62c2..5e2059242e2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -416,6 +416,7 @@ export CFG_ENABLE_MINGW_CROSS export CFG_PREFIX export CFG_LIBDIR export CFG_RUSTLIBDIR +export LIBDIR_RELATIVE ###################################################################### # Subprograms @@ -433,12 +434,12 @@ define SREQ # Destinations of artifacts for the host compiler HROOT$(1)_H_$(3) = $(3)/stage$(1) HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin -HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR) +HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(LIBDIR_RELATIVE) # Destinations of artifacts for target architectures TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLIBDIR)/$(2) TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin -TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR) +TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib # The name of the standard and extra libraries used by rustc HSTDLIB_DEFAULT$(1)_H_$(3) = \ |