| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 1 | From 95b2cd0169cb1b4694c2bce67169b1aa1d5e2be0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex@linutronix.de> |
| 3 | Date: Tue, 21 Sep 2021 16:27:14 +0200 |
| 4 | Subject: [PATCH] Makefile.am: pass rust target to cargo also when not cross |
| 5 | compiling |
| 6 | |
| 7 | Otherwise oe-core's native build doesn't work either. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [oe-core specific] |
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 11 | --- |
| 12 | Makefile.am | 2 -- |
| 13 | configure.ac | 4 +--- |
| 14 | 2 files changed, 1 insertion(+), 5 deletions(-) |
| 15 | |
| 16 | diff --git a/Makefile.am b/Makefile.am |
| 17 | index e93714e..effe5d3 100644 |
| 18 | --- a/Makefile.am |
| 19 | +++ b/Makefile.am |
| 20 | @@ -137,9 +137,7 @@ else |
| 21 | CARGO_RELEASE_ARGS=--release |
| 22 | endif |
| 23 | |
| 24 | -if CROSS_COMPILING |
| 25 | CARGO_TARGET_ARGS=--target=$(RUST_TARGET) |
| 26 | -endif |
| 27 | |
| 28 | CARGO_VERBOSE = $(cargo_verbose_$(V)) |
| 29 | cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY)) |
| 30 | diff --git a/configure.ac b/configure.ac |
| 31 | index 41590ca..84cd56b 100644 |
| 32 | --- a/configure.ac |
| 33 | +++ b/configure.ac |
| 34 | @@ -255,9 +255,7 @@ AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)]) |
| 35 | : ${RUST_TARGET:=$host} |
| 36 | |
| 37 | AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes]) |
| 38 | -AS_IF([test "x$cross_compiling" = "xyes"], [ |
| 39 | - RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" |
| 40 | -]) |
| 41 | +RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" |
| 42 | AC_SUBST([RUST_TARGET_SUBDIR]) |
| 43 | |
| 44 | dnl =========================================================================== |
| 45 | -- |
| 46 | 2.20.1 |
| 47 | |