summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2019-02-16 03:16:31 (GMT)
committermidipix <writeonce@midipix.org>2019-02-18 03:12:50 (GMT)
commite6f0f08cc2b0d1b8711b28eb3d06f3a49716b104 (patch)
tree80a0ba97300513168d416dfe7783fb52324628aa
parentb3fe80bb9ada2692e07bb12d90da4245fdb9ef92 (diff)
downloadperk-e6f0f08cc2b0d1b8711b28eb3d06f3a49716b104.tar.bz2
perk-e6f0f08cc2b0d1b8711b28eb3d06f3a49716b104.tar.xz
build system: ccenv: attemt to use otool for binary format detection.
-rw-r--r--sofort/ccenv/ccenv.sh21
1 files changed, 20 insertions, 1 deletions
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh
index 04db31e..91f613c 100644
--- a/sofort/ccenv/ccenv.sh
+++ b/sofort/ccenv/ccenv.sh
@@ -87,7 +87,7 @@ ccenv_find_tool()
ccenv_set_primary_tools()
{
ccenv_core_tools="ar nm objdump ranlib size strip strings objcopy"
- ccenv_hack_tools="addr2line cov elfedit readelf readobj"
+ ccenv_hack_tools="addr2line cov elfedit readelf readobj otool"
ccenv_peep_tools="perk mdso dlltool windmc windres"
for __tool in $ccenv_core_tools $ccenv_hack_tools $ccenv_peep_tools; do
@@ -528,6 +528,7 @@ ccenv_create_freestanding_executable()
ccenv_set_cc_binfmt()
{
ccenv_use_perk=
+ ccenv_use_otool=
ccenv_use_readelf=
ccenv_use_readobj=
ccenv_use_bfd_objdump=
@@ -573,6 +574,24 @@ ccenv_set_cc_binfmt()
&& ccenv_use_readelf=yes
fi
+ # MACHO-64 / otool
+ if [ -n "$ccenv_otool" ] && [ -z "$ccenv_cc_binfmt" ]; then
+ $ccenv_otool -hv $ccenv_image 2>/dev/null \
+ | grep -i 'MH_MAGIC_64' \
+ > /dev/null \
+ && ccenv_cc_binfmt='MACHO' \
+ && ccenv_use_otool=yes
+ fi
+
+ # MACHO-32 / otool
+ if [ -n "$ccenv_otool" ] && [ -z "$ccenv_cc_binfmt" ]; then
+ $ccenv_otool -hv $ccenv_image 2>/dev/null \
+ | grep -i 'MH_MAGIC' \
+ > /dev/null \
+ && ccenv_cc_binfmt='MACHO' \
+ && ccenv_use_otool=yes
+ fi
+
# MACHO-64 / readelf
if [ -n "$ccenv_readany" ] && [ -z "$ccenv_cc_binfmt" ]; then
$ccenv_readany -h $ccenv_image 2>/dev/null \