Skip to contentSkip to conversation

package/pkg-cargo.mk: enable -Z target-applies-to-host via env

PATCH In review James Hilliard 3 participants 4 messages Jan 9, 2022 – Jul 25, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pkg-cargo.mk: enable -Z target-applies-to-host via env

This should be more reliable and fix the host == target bug when doing indirect invocations using the cargo env.

---
 package/pkg-cargo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-cargo.mk +1 -1
index 47ae86bfae..b6cb65c4f0 100644
@@ -27,6 +27,7 @@
 PKG_CARGO_ENV = \
 	CARGO_HOME=$(HOST_DIR)/share/cargo \
 	__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \
+	CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \
 	CARGO_TARGET_APPLIES_TO_HOST="false"
 
 ################################################################################
@@ -88,7 +89,6 @@ define $(2)_BUILD_CMDS
 			$$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \
 			--manifest-path Cargo.toml \
 			--locked \
-			-Z target-applies-to-host \
 			$$($(2)_CARGO_BUILD_OPTS)
 endef
 else # ifeq ($(4),target)
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 7 lines · On Sun, 9 Jan 2022 01:47:32 -0700 James Hilliard <[email protected]>…

This should be more reliable and fix the host == target bug when doing indirect invocations using the cargo env.

---
 package/pkg-cargo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I've applied, after integrating that into a larger series, and adding more comments in the code about all those variables.

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to James Hilliard

James, All,

Resurecting this old patch that was applied, but I have a question about it, see below...

On 2022-01-09 01:47 -0700, James Hilliard spake thusly:

Quoted 21 lines

This should be more reliable and fix the host == target bug when doing indirect invocations using the cargo env.

---
 package/pkg-cargo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-cargo.mk +1 -0
index 47ae86bfae..b6cb65c4f0 100644
@@ -27,6 +27,7 @@
 PKG_CARGO_ENV = \
 	CARGO_HOME=$(HOST_DIR)/share/cargo \
 	__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \
+	CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \
 	CARGO_TARGET_APPLIES_TO_HOST="false"
 
 ################################################################################

package/pkg-cargo.mk define $(2)_BUILD_CMDS · line 91

Quoted 4 lines
package/pkg-cargo.mk +0 -1
@@ -88,7 +89,6 @@ define $(2)_BUILD_CMDS
 			$$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \
 			--manifest-path Cargo.toml \
 			--locked \
-			-Z target-applies-to-host \

Did you forget to remove it from the _INSTALL_TARGET_CMDS?

Regards,
Yann E. MORIN.

Quoted 10 lines
package/pkg-cargo.mk +0 -0
 			$$($(2)_CARGO_BUILD_OPTS)
 endef
 else # ifeq ($(4),target)
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
Quoted 26 lines · Yann E. MORIN

James, All,

Resurecting this old patch that was applied, but I have a question about it, see below...

On 2022-01-09 01:47 -0700, James Hilliard spake thusly:

Quoted 19 lines

This should be more reliable and fix the host == target bug when doing indirect invocations using the cargo env.

---
 package/pkg-cargo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-cargo.mk +1 -0
index 47ae86bfae..b6cb65c4f0 100644
@@ -27,6 +27,7 @@
 PKG_CARGO_ENV = \
      CARGO_HOME=$(HOST_DIR)/share/cargo \
      __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \
+     CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \
      CARGO_TARGET_APPLIES_TO_HOST="false"
 
Quoted 8 lines

package/pkg-cargo.mk define $(2)_BUILD_CMDS · line 91

Quoted 6 lines
package/pkg-cargo.mk +0 -1
 ################################################################################
@@ -88,7 +89,6 @@ define $(2)_BUILD_CMDS
                      $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \
                      --manifest-path Cargo.toml \
                      --locked \
-                     -Z target-applies-to-host \

Did you forget to remove it from the _INSTALL_TARGET_CMDS?

Yeah, looks like it.

Quoted 15 lines

Regards,
Yann E. MORIN.

Quoted 10 lines
package/pkg-cargo.mk +0 -1
                      $$($(2)_CARGO_BUILD_OPTS)
 endef
 else # ifeq ($(4),target)
--

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Quoted 7 lines

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot