Skip to content

Commit 2d4e97c

Browse files
radaretrufae
authored andcommitted
Fix #22956 - Update acr to adjust the macppc triplet ##build
1 parent 29b0160 commit 2d4e97c

File tree

7 files changed

+23
-9
lines changed

7 files changed

+23
-9
lines changed

configure

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,27 @@ if [ -e "${VPATH}/config.guess" ]; then
101101
sh ${VPATH}/config.guess
102102
return
103103
fi
104-
CPU="`uname -m|sed -e 's, ,,g'|cut -d - -f 1`"
104+
CPU="`uname -m | tr 'A-Z' 'a-z' | sed -e 's, ,,g' | cut -d - -f 1`"
105105
OS="`uname -s|tr A-Z a-z`"
106106
uname -r | grep -qE "(Microsoft|WSL)" 2>/dev/null && OS="wsl"
107107
GNU="`uname --help 2>&1 | grep gnu`"
108108
[ "${GNU}" ] && OS="${OS}-gnu"
109-
[ "${CPU}" = ppc ] && CPU="powerpc"
110-
echo "${CPU}-unknown-${OS}"
109+
# normalize CPU
110+
case "${CPU}" in
111+
ppc*|powermac*|powermacintosh*|powerpc*)
112+
if echo "${CPU}" | grep -q '64'; then
113+
CPU=powerpc64
114+
else
115+
CPU=powerpc
116+
fi
117+
;;
118+
*) ;;
119+
esac
120+
VENDOR="unknown"
121+
if [ "${OS}" = "darwin" ]; then
122+
VENDOR=apple
123+
fi
124+
echo "${CPU}-${VENDOR}-${OS}"
111125
}
112126

113127
SEARCHPATH="/usr /usr/local /usr/pkg /sw"

subprojects/binaryninja.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WRAP_wrap_git_directory:=binaryninja
66
WRAP_wrap_git_patch_directory:=binaryninja
77
WRAP_wrap_git_depth:=1
88

9-
.PHONY: binaryninja
9+
.PHONY: binaryninja_clean binaryninja_all
1010

1111
binaryninja:
1212
if [ ! -d "binaryninja" -o "c40a5f04deec68d388b2072dc42b29141089f9ce" != "$(shell cd binaryninja 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "binaryninja"; ${MAKE} binaryninja_all; fi

subprojects/capstone-next.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WRAP_wrap_git_directory:=capstone-next
77
WRAP_wrap_git_diff_files:=capstone-next/capstone-patches/fix-x86-16.patch
88
WRAP_wrap_git_depth:=1
99

10-
.PHONY: capstone-next
10+
.PHONY: capstone-next_clean capstone-next_all
1111

1212
capstone-next:
1313
if [ ! -d "capstone-next" -o "ccbc41d3dadb2953deed9e050abfae146876288d" != "$(shell cd capstone-next 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-next"; ${MAKE} capstone-next_all; fi

subprojects/capstone-v4.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WRAP_wrap_git_directory:=capstone-v4
77
WRAP_wrap_git_diff_files:=capstone-v4/capstone-patches/v4/capstone-calloc.patch,capstone-v4/capstone-patches/v4/fix-x86-16.patch,capstone-v4/capstone-patches/v4/sparc-crash.patch,capstone-v4/capstone-patches/v4/sstream-null.patch
88
WRAP_wrap_git_depth:=1
99

10-
.PHONY: capstone-v4
10+
.PHONY: capstone-v4_clean capstone-v4_all
1111

1212
capstone-v4:
1313
if [ ! -d "capstone-v4" -o "d7e459d026b19d6c3a7b743bfc475d919ff03f74" != "$(shell cd capstone-v4 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-v4"; ${MAKE} capstone-v4_all; fi

subprojects/capstone-v5.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WRAP_wrap_git_directory:=capstone-v5
77
WRAP_wrap_git_diff_files:=capstone-v5/capstone-patches/fix-x86-16.patch
88
WRAP_wrap_git_depth:=1
99

10-
.PHONY: capstone-v5
10+
.PHONY: capstone-v5_clean capstone-v5_all
1111

1212
capstone-v5:
1313
if [ ! -d "capstone-v5" -o "accf4df62f1fba6f92cae692985d27063552601c" != "$(shell cd capstone-v5 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-v5"; ${MAKE} capstone-v5_all; fi

subprojects/qjs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WRAP_wrap_git_directory:=qjs
66
WRAP_wrap_git_patch_directory:=qjs
77
WRAP_wrap_git_depth:=1
88

9-
.PHONY: qjs
9+
.PHONY: qjs_clean qjs_all
1010

1111
qjs:
1212
if [ ! -d "qjs" -o "7238ee64dbc2fbdea044555cda8cda78785a93ed" != "$(shell cd qjs 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "qjs"; ${MAKE} qjs_all; fi

subprojects/sdb.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ WRAP_wrap_git_revision:=2.2.0
55
WRAP_wrap_git_directory:=sdb
66
WRAP_wrap_git_depth:=1
77

8-
.PHONY: sdb
8+
.PHONY: sdb_clean sdb_all
99

1010
sdb:
1111
if [ ! -d "sdb" -o "2.2.0" != "$(shell cd sdb 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "sdb"; ${MAKE} sdb_all; fi

0 commit comments

Comments
 (0)