From a5aed571787ccc4698d5a628e54cbea00832957a Mon Sep 17 00:00:00 2001 From: Rauhul Varma Date: Thu, 15 May 2025 22:01:09 -0700 Subject: [PATCH] Remove extra flags for SwiftPM builds Due to SwiftPM improvements we no longer need to manually specify these flags when building Embedded Swift code. Fixes #128 --- .swift-version | 2 +- Tools/Toolsets/pico.json | 3 +-- Tools/Toolsets/pico2.json | 3 +-- Tools/Toolsets/stm32f74x-lcd.json | 3 +-- Tools/Toolsets/stm32f74x.json | 3 +-- rpi-4b-blink/Makefile | 3 +-- rpi-5-blink/Makefile | 3 +-- rpi-pico-blink/Makefile | 3 +-- rpi-pico2-neopixel/Makefile | 3 +-- stm32-lcd-logo/Makefile | 3 +-- stm32-neopixel/Makefile | 3 +-- stm32-uart-echo/Makefile | 3 +-- 12 files changed, 12 insertions(+), 23 deletions(-) diff --git a/.swift-version b/.swift-version index 7fb2313..0c246aa 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -main-snapshot-2025-06-01 \ No newline at end of file +main-snapshot-2025-06-01 diff --git a/Tools/Toolsets/pico.json b/Tools/Toolsets/pico.json index c03da81..15f589c 100644 --- a/Tools/Toolsets/pico.json +++ b/Tools/Toolsets/pico.json @@ -18,8 +18,7 @@ "-segaddr", "__RESET", "0x20000000", "-segaddr", "__VECTORS", "0x20000100", "-seg1addr", "0x20000200", - "-pagezero_size", "0", - "-allow_dead_duplicates" + "-pagezero_size", "0" ] } } diff --git a/Tools/Toolsets/pico2.json b/Tools/Toolsets/pico2.json index 8d5a1fc..873afca 100644 --- a/Tools/Toolsets/pico2.json +++ b/Tools/Toolsets/pico2.json @@ -17,8 +17,7 @@ "-segaddr", "__VECTORS", "0x20000000", "-segaddr", "__RESET", "0x20000200", "-seg1addr", "0x20000300", - "-pagezero_size", "0", - "-allow_dead_duplicates" + "-pagezero_size", "0" ] } } diff --git a/Tools/Toolsets/stm32f74x-lcd.json b/Tools/Toolsets/stm32f74x-lcd.json index 0b3c7c0..e698378 100644 --- a/Tools/Toolsets/stm32f74x-lcd.json +++ b/Tools/Toolsets/stm32f74x-lcd.json @@ -16,8 +16,7 @@ "-segalign", "4", "-segaddr", "__VECTORS", "0x00200000", "-seg1addr", "0x00200200", - "-pagezero_size", "0", - "-allow_dead_duplicates" + "-pagezero_size", "0" ] } } diff --git a/Tools/Toolsets/stm32f74x.json b/Tools/Toolsets/stm32f74x.json index a05aea6..b22fb6e 100644 --- a/Tools/Toolsets/stm32f74x.json +++ b/Tools/Toolsets/stm32f74x.json @@ -16,8 +16,7 @@ "-segalign", "4", "-segaddr", "__VECTORS", "0x20010000", "-seg1addr", "0x20010200", - "-pagezero_size", "0", - "-allow_dead_duplicates" + "-pagezero_size", "0" ] } } diff --git a/rpi-4b-blink/Makefile b/rpi-4b-blink/Makefile index 77b7f29..1ee6e51 100644 --- a/rpi-4b-blink/Makefile +++ b/rpi-4b-blink/Makefile @@ -22,8 +22,7 @@ TARGET := $(ARCH)-none-none-elf SWIFT_BUILD_ARGS := \ --configuration release \ --triple $(TARGET) \ - --toolset $(TOOLSET) \ - --disable-local-rpath + --toolset $(TOOLSET) BUILDROOT := $(shell $(SWIFT_BUILD) $(SWIFT_BUILD_ARGS) --show-bin-path) .PHONY: build diff --git a/rpi-5-blink/Makefile b/rpi-5-blink/Makefile index 480a29b..f07ed95 100644 --- a/rpi-5-blink/Makefile +++ b/rpi-5-blink/Makefile @@ -22,8 +22,7 @@ TARGET := $(ARCH)-none-none-elf SWIFT_BUILD_ARGS := \ --configuration release \ --triple $(TARGET) \ - --toolset $(TOOLSET) \ - --disable-local-rpath + --toolset $(TOOLSET) BUILDROOT := $(shell $(SWIFT_BUILD) $(SWIFT_BUILD_ARGS) --show-bin-path) .PHONY: build diff --git a/rpi-pico-blink/Makefile b/rpi-pico-blink/Makefile index cfeb3bb..15cee44 100755 --- a/rpi-pico-blink/Makefile +++ b/rpi-pico-blink/Makefile @@ -23,8 +23,7 @@ TARGET := $(ARCH)-apple-none-macho SWIFT_BUILD_ARGS := \ --configuration release \ --triple $(TARGET) \ - --toolset $(TOOLSET) \ - --disable-local-rpath + --toolset $(TOOLSET) BUILDROOT := $(shell $(SWIFT_BUILD) $(SWIFT_BUILD_ARGS) --show-bin-path) .PHONY: build diff --git a/rpi-pico2-neopixel/Makefile b/rpi-pico2-neopixel/Makefile index 1527c89..448b28c 100644 --- a/rpi-pico2-neopixel/Makefile +++ b/rpi-pico2-neopixel/Makefile @@ -22,8 +22,7 @@ TARGET := $(ARCH)-apple-none-macho SWIFT_BUILD_ARGS := \ --configuration release \ --triple $(TARGET) \ - --toolset $(TOOLSET) \ - --disable-local-rpath + --toolset $(TOOLSET) BUILDROOT := $(shell $(SWIFT_BUILD) $(SWIFT_BUILD_ARGS) --show-bin-path) .PHONY: build diff --git a/stm32-lcd-logo/Makefile b/stm32-lcd-logo/Makefile index fb19980..ae09781 100644 --- a/stm32-lcd-logo/Makefile +++ b/stm32-lcd-logo/Makefile @@ -22,8 +22,7 @@ TARGET := $(ARCH)-apple-none-macho SWIFT_BUILD_ARGS := \ --configuration release \ --triple $(TARGET) \ - --toolset $(TOOLSET) \ - --disable-local-rpath + --toolset $(TOOLSET) BUILDROOT := $(shell $(SWIFT_BUILD) $(SWIFT_BUILD_ARGS) --show-bin-path) .PHONY: build diff --git a/stm32-neopixel/Makefile b/stm32-neopixel/Makefile index d66a5fc..6b0125c 100755 --- a/stm32-neopixel/Makefile +++ b/stm32-neopixel/Makefile @@ -22,8 +22,7 @@ TARGET := $(ARCH)-apple-none-macho SWIFT_BUILD_ARGS := \ --configuration release \ --triple $(TARGET) \ - --toolset $(TOOLSET) \ - --disable-local-rpath + --toolset $(TOOLSET) BUILDROOT := $(shell $(SWIFT_BUILD) $(SWIFT_BUILD_ARGS) --show-bin-path) .PHONY: build diff --git a/stm32-uart-echo/Makefile b/stm32-uart-echo/Makefile index 9c8ffe2..bf72766 100755 --- a/stm32-uart-echo/Makefile +++ b/stm32-uart-echo/Makefile @@ -22,8 +22,7 @@ TARGET := $(ARCH)-apple-none-macho SWIFT_BUILD_ARGS := \ --configuration release \ --triple $(TARGET) \ - --toolset $(TOOLSET) \ - --disable-local-rpath + --toolset $(TOOLSET) BUILDROOT := $(shell $(SWIFT_BUILD) $(SWIFT_BUILD_ARGS) --show-bin-path) .PHONY: build