mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-01 20:29:00 +00:00
d1202bd501
On the sim target (Windows/macOS/Linux), hello_rust_cargo_main() ended
with an infinite `loop {}` that never returned control to NSH, so the
example could not exit and the shell prompt hung.
Introduce a Cargo `sim` feature that is enabled only when CONFIG_ARCH_SIM
is set, and use it to compile out the trailing infinite loop and return 0
instead. Other embedded targets keep the original looping behavior.
Signed-off-by: Shoji Tokunaga <toku@mac.com>
47 lines
1.7 KiB
Makefile
47 lines
1.7 KiB
Makefile
############################################################################
|
|
# apps/examples/rust/hello/Makefile
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright ownership. The
|
|
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance with the
|
|
# License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
############################################################################
|
|
|
|
include $(APPDIR)/Make.defs
|
|
|
|
# Hello, Rust! built-in application info
|
|
|
|
PROGNAME = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO_PROGNAME)
|
|
PRIORITY = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO_PRIORITY)
|
|
STACKSIZE = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO_STACKSIZE)
|
|
MODULE = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO)
|
|
|
|
RUST_LIB := $(call RUST_GET_BINDIR,hello,$(APPDIR)/examples/rust)
|
|
RUST_SRCS := $(call RUST_CARGO_SRCS,hello,$(APPDIR)/examples/rust)
|
|
|
|
ifeq ($(CONFIG_ARCH_SIM),y)
|
|
HELLO_RUST_FEATURES := sim
|
|
endif
|
|
|
|
$(RUST_LIB): $(RUST_SRCS)
|
|
$(call RUST_CARGO_BUILD,hello,$(APPDIR)/examples/rust,$(HELLO_RUST_FEATURES))
|
|
|
|
context:: $(RUST_LIB)
|
|
|
|
all:: $(RUST_LIB)
|
|
|
|
clean::
|
|
$(call RUST_CARGO_CLEAN,hello,$(APPDIR)/examples/rust)
|
|
|
|
include $(APPDIR)/Application.mk
|