Skip to content

Commit a973bca

Browse files
committed
Fix for poor logic in intermediate as shell script causing good as arguments to be stripped errantly (also fixed typo in same file)
1 parent 883095e commit a973bca

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

XcodeLegacy.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -661,10 +661,9 @@ ARCH_FOUND=0
661661
AS_ARGS=()
662662
for var in "\$@"
663663
do
664-
if [ "\$ARCH_FOUND" -eq '1' ]; then
665-
ARCH=\$var
664+
if [ -z "\$ARCH" ] && [ "\$ARCH_FOUND" -eq '1' ]; then
665+
ARCH="\$var"
666666
AS_ARGS+=("\$var")
667-
break
668667
elif [ "\$var" = '-arch' ]; then
669668
ARCH_FOUND=1
670669
AS_ARGS+=("\$var")
@@ -692,7 +691,7 @@ if [ "\$ARCH_FOUND" -eq '1' ]; then
692691
fi
693692
fi
694693
if [ "\$AS_FOUND" -eq '1' ]; then
695-
exec \$AS "\${AR_ARGS[@]}"
694+
exec \$AS "\${AS_ARGS[@]}"
696695
else
697696
if [ -x "\$AS_DIR/as-original" ]; then
698697
ASORIGINAL="\$AS_DIR/as-original"

0 commit comments

Comments
 (0)