Remove extra flags for SwiftPM builds (#156)

rauhul · web-flow · commit 8e97a6dac2f3 · 2025-06-21T15:05:09.000-07:00
Due to SwiftPM improvements we no longer need to manually specify these flags when building Embedded Swift code. Fixes #128
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-main-snapshot-2025-06-01
+main-snapshot-2025-06-01
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-main-snapshot-2025-06-01`
	`1`	`+main-snapshot-2025-06-01`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@`
`18`	`18`	`"-segaddr", "__RESET", "0x20000000",`
`19`	`19`	`"-segaddr", "__VECTORS", "0x20000100",`
`20`	`20`	`"-seg1addr", "0x20000200",`
`21`		`- "-pagezero_size", "0",`
`22`		`- "-allow_dead_duplicates"`
	`21`	`+ "-pagezero_size", "0"`
`23`	`22`	`]`
`24`	`23`	`}`
`25`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@`
`17`	`17`	`"-segaddr", "__VECTORS", "0x20000000",`
`18`	`18`	`"-segaddr", "__RESET", "0x20000200",`
`19`	`19`	`"-seg1addr", "0x20000300",`
`20`		`- "-pagezero_size", "0",`
`21`		`- "-allow_dead_duplicates"`
	`20`	`+ "-pagezero_size", "0"`
`22`	`21`	`]`
`23`	`22`	`}`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@`
`16`	`16`	`"-segalign", "4",`
`17`	`17`	`"-segaddr", "__VECTORS", "0x00200000",`
`18`	`18`	`"-seg1addr", "0x00200200",`
`19`		`- "-pagezero_size", "0",`
`20`		`- "-allow_dead_duplicates"`
	`19`	`+ "-pagezero_size", "0"`
`21`	`20`	`]`
`22`	`21`	`}`
`23`	`22`	`}`