Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 840f6d6

Browse files
Add Cargo.toml to dependencies
1 parent b48a89f commit 840f6d6

File tree

21 files changed

+46
-46
lines changed

21 files changed

+46
-46
lines changed

‎01_wait_forever/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export LD_SCRIPT_PATH
5151
##--------------------------------------------------------------------------------------------------
5252
## Targets and Prerequisites
5353
##--------------------------------------------------------------------------------------------------
54+
KERNEL_MANIFEST = Cargo.toml
5455
KERNEL_LINKER_SCRIPT = kernel.ld
55-
56-
LAST_BUILD_CONFIG = target/$(BSP).build_config
56+
LAST_BUILD_CONFIG = target/$(BSP).build_config
5757

5858
KERNEL_ELF = target/$(TARGET)/release/kernel
5959
# This parses cargo's dep-info file.
6060
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
61-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
61+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6262

6363

6464

‎02_runtime_init/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export LD_SCRIPT_PATH
5151
##--------------------------------------------------------------------------------------------------
5252
## Targets and Prerequisites
5353
##--------------------------------------------------------------------------------------------------
54+
KERNEL_MANIFEST = Cargo.toml
5455
KERNEL_LINKER_SCRIPT = kernel.ld
55-
56-
LAST_BUILD_CONFIG = target/$(BSP).build_config
56+
LAST_BUILD_CONFIG = target/$(BSP).build_config
5757

5858
KERNEL_ELF = target/$(TARGET)/release/kernel
5959
# This parses cargo's dep-info file.
6060
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
61-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
61+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6262

6363

6464

‎03_hacky_hello_world/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export LD_SCRIPT_PATH
5151
##--------------------------------------------------------------------------------------------------
5252
## Targets and Prerequisites
5353
##--------------------------------------------------------------------------------------------------
54+
KERNEL_MANIFEST = Cargo.toml
5455
KERNEL_LINKER_SCRIPT = kernel.ld
55-
56-
LAST_BUILD_CONFIG = target/$(BSP).build_config
56+
LAST_BUILD_CONFIG = target/$(BSP).build_config
5757

5858
KERNEL_ELF = target/$(TARGET)/release/kernel
5959
# This parses cargo's dep-info file.
6060
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
61-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
61+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6262

6363

6464

‎04_safe_globals/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export LD_SCRIPT_PATH
5151
##--------------------------------------------------------------------------------------------------
5252
## Targets and Prerequisites
5353
##--------------------------------------------------------------------------------------------------
54+
KERNEL_MANIFEST = Cargo.toml
5455
KERNEL_LINKER_SCRIPT = kernel.ld
55-
56-
LAST_BUILD_CONFIG = target/$(BSP).build_config
56+
LAST_BUILD_CONFIG = target/$(BSP).build_config
5757

5858
KERNEL_ELF = target/$(TARGET)/release/kernel
5959
# This parses cargo's dep-info file.
6060
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
61-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
61+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6262

6363

6464

‎05_drivers_gpio_uart/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ export LD_SCRIPT_PATH
5454
##--------------------------------------------------------------------------------------------------
5555
## Targets and Prerequisites
5656
##--------------------------------------------------------------------------------------------------
57+
KERNEL_MANIFEST = Cargo.toml
5758
KERNEL_LINKER_SCRIPT = kernel.ld
58-
59-
LAST_BUILD_CONFIG = target/$(BSP).build_config
59+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6060

6161
KERNEL_ELF = target/$(TARGET)/release/kernel
6262
# This parses cargo's dep-info file.
6363
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
64-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
64+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6565

6666

6767

‎06_uart_chainloader/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ export LD_SCRIPT_PATH
5656
##--------------------------------------------------------------------------------------------------
5757
## Targets and Prerequisites
5858
##--------------------------------------------------------------------------------------------------
59+
KERNEL_MANIFEST = Cargo.toml
5960
KERNEL_LINKER_SCRIPT = kernel.ld
60-
61-
LAST_BUILD_CONFIG = target/$(BSP).build_config
61+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6262

6363
KERNEL_ELF = target/$(TARGET)/release/kernel
6464
# This parses cargo's dep-info file.
6565
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
66-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
66+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6767

6868

6969

‎07_timestamps/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ export LD_SCRIPT_PATH
5454
##--------------------------------------------------------------------------------------------------
5555
## Targets and Prerequisites
5656
##--------------------------------------------------------------------------------------------------
57+
KERNEL_MANIFEST = Cargo.toml
5758
KERNEL_LINKER_SCRIPT = kernel.ld
58-
59-
LAST_BUILD_CONFIG = target/$(BSP).build_config
59+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6060

6161
KERNEL_ELF = target/$(TARGET)/release/kernel
6262
# This parses cargo's dep-info file.
6363
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
64-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
64+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6565

6666

6767

‎08_hw_debug_JTAG/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ export LD_SCRIPT_PATH
5858
##--------------------------------------------------------------------------------------------------
5959
## Targets and Prerequisites
6060
##--------------------------------------------------------------------------------------------------
61+
KERNEL_MANIFEST = Cargo.toml
6162
KERNEL_LINKER_SCRIPT = kernel.ld
62-
63-
LAST_BUILD_CONFIG = target/$(BSP).build_config
63+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6464

6565
KERNEL_ELF = target/$(TARGET)/release/kernel
6666
# This parses cargo's dep-info file.
6767
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
68-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
68+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6969

7070

7171

‎09_privilege_level/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ export LD_SCRIPT_PATH
5858
##--------------------------------------------------------------------------------------------------
5959
## Targets and Prerequisites
6060
##--------------------------------------------------------------------------------------------------
61+
KERNEL_MANIFEST = Cargo.toml
6162
KERNEL_LINKER_SCRIPT = kernel.ld
62-
63-
LAST_BUILD_CONFIG = target/$(BSP).build_config
63+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6464

6565
KERNEL_ELF = target/$(TARGET)/release/kernel
6666
# This parses cargo's dep-info file.
6767
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
68-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
68+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6969

7070

7171

‎10_virtual_mem_part1_identity_mapping/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ export LD_SCRIPT_PATH
5858
##--------------------------------------------------------------------------------------------------
5959
## Targets and Prerequisites
6060
##--------------------------------------------------------------------------------------------------
61+
KERNEL_MANIFEST = Cargo.toml
6162
KERNEL_LINKER_SCRIPT = kernel.ld
62-
63-
LAST_BUILD_CONFIG = target/$(BSP).build_config
63+
LAST_BUILD_CONFIG = target/$(BSP).build_config
6464

6565
KERNEL_ELF = target/$(TARGET)/release/kernel
6666
# This parses cargo's dep-info file.
6767
# https://doc.rust-lang.org/cargo/guide/build-cache.html#dep-info-files
68-
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(LAST_BUILD_CONFIG)
68+
KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST)$(LAST_BUILD_CONFIG)
6969

7070

7171

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /