Skip to content

Commit 136c219

Browse files
committed
Removed out-of-date cross-compilation build settings that was preventing working builds on rPI.
1 parent 78899f9 commit 136c219

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

Sources/whisper/whisper/Whisper.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,10 @@ internal class Whisper
375375
#if os(Linux)
376376
#if TARGET_ARCH_armv7
377377
gLogger.info(" > Requesting script.armv7.sh")
378-
system("curl -sSL http://www.paulnettle.com/magicbox/script.armv7.sh | bash")
378+
system("curl -sSL <your update script here> | bash")
379379
#elseif TARGET_ARCH_armv6
380380
gLogger.info(" > Requesting script.armv6.sh")
381-
system("curl -sSL http://www.paulnettle.com/magicbox/script.armv6.sh | bash")
381+
system("curl -sSL <your update script here> | bash")
382382
#else
383383
gLogger.warn("Whisper.checkForUpdates: Command 'checkForUpdates' not supported on this architecture (must be arvm6 or armv7)")
384384
#endif

build

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,11 @@ allTargets=(
2626
"armv6"
2727
"armv7"
2828
)
29-
allTargetDestinations=(
30-
"/Library/Developer/Destinations/armhf-5.1.1-RELEASE_armv6.json"
31-
"/Library/Developer/Destinations/armhf-5.1.1-RELEASE.json"
32-
)
33-
allTargetToolchains=(
34-
"/Library/Developer/Toolchains/armhf-5.1.1-RELEASE_armv6.xctoolchain/usr/bin/"
35-
"/Library/Developer/Toolchains/armhf-5.1.1-RELEASE.xctoolchain/usr/bin/"
36-
)
3729
allTargetOptions=(
3830
"
3931
-Xswiftc -DTARGET_ARCH_armv6 -Xswiftc -DPLATFORM_RPI -Xswiftc -DUSE_MMAL\
4032
-Xcxx -DTARGET_ARCH_armv6 -Xcxx -DPLATFORM_RPI -Xcxx -DUSE_MMAL\
4133
\
42-
-Xcxx -I/Library/Developer/SDKs/armhf-5.1.1-RELEASE_armv6.sdk/opt/vc/include\
43-
-Xswiftc -I/Library/Developer/SDKs/armhf-5.1.1-RELEASE_armv6.sdk/opt/vc/include\
44-
-Xswiftc -L/Library/Developer/SDKs/armhf-5.1.1-RELEASE_armv6.sdk/opt/vc/lib\
45-
\
4634
-Xlinker -lmmal_core\
4735
-Xlinker -lmmal_util\
4836
-Xlinker -lmmal_vc_client\
@@ -54,10 +42,6 @@ allTargetOptions=(
5442
-Xswiftc -DTARGET_ARCH_armv7 -Xswiftc -DPLATFORM_RPI -Xswiftc -DUSE_MMAL\
5543
-Xcxx -DTARGET_ARCH_armv7 -Xcxx -DPLATFORM_RPI -Xcxx -DUSE_MMAL\
5644
\
57-
-Xcxx -I/Library/Developer/SDKs/armhf-5.1.1-RELEASE.sdk/opt/vc/include\
58-
-Xswiftc -I/Library/Developer/SDKs/armhf-5.1.1-RELEASE.sdk/opt/vc/include\
59-
-Xswiftc -L/Library/Developer/SDKs/armhf-5.1.1-RELEASE.sdk/opt/vc/lib\
60-
\
6145
-Xlinker -lmmal_core\
6246
-Xlinker -lmmal_util\
6347
-Xlinker -lmmal_vc_client\
@@ -220,8 +204,6 @@ while [[ $# -gt 0 ]]; do
220204
if [[ ${allTargets[$i]} == $1 ]]; then
221205
if [[ -z $targetToolchainDestination ]]; then
222206
targetPlatform="$1"
223-
targetToolchainDestination="${allTargetDestinations[$i]}"
224-
targetToolchainBinPath="${allTargetToolchains[$i]}"
225207
targetOptions="${allTargetOptions[$i]}"
226208
found=1
227209
break

0 commit comments

Comments
 (0)