From 9e8cef3ff732417a93c020e27cfa421586b9e2e9 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Wed, 19 Nov 2014 13:27:04 -0500 Subject: [PATCH] Revert "tweak patch" This reverts commit 673eef783506b068e5b260dde455501f2c6c0f11. --- ...k-always-use-bin-and-lib-as-bindir-and-libdir-for-s.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/rust/files/0025-mk-always-use-bin-and-lib-as-bindir-and-libdir-for-s.patch b/recipes/rust/files/0025-mk-always-use-bin-and-lib-as-bindir-and-libdir-for-s.patch index e09ad82..22f3ab9 100644 --- a/recipes/rust/files/0025-mk-always-use-bin-and-lib-as-bindir-and-libdir-for-s.patch +++ b/recipes/rust/files/0025-mk-always-use-bin-and-lib-as-bindir-and-libdir-for-s.patch @@ -12,7 +12,7 @@ diff --git a/mk/main.mk b/mk/main.mk index 0fb6f5f..676ea21 100644 --- a/mk/main.mk +++ b/mk/main.mk -@@ -333,8 +333,17 @@ define SREQ +@@ -333,8 +333,18 @@ define SREQ # Destinations of artifacts for the host compiler HROOT$(1)_H_$(3) = $(3)/stage$(1) @@ -23,10 +23,11 @@ index 0fb6f5f..676ea21 100644 +# libdir. At the moment, this assumes the relative paths (from sysroot aka +# prefix) are 'lib' and 'bin'. +HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin ++HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib +else HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_BINDIR_RELATIVE) -+endif HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE) ++endif # Destinations of artifacts for target architectures TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)