eclass/multilib-build: fix ABI matching for ppc-macos
authorFabian Groffen <grobian@gentoo.org>
Thu, 4 Jan 2018 15:14:26 +0000 (16:14 +0100)
committerFabian Groffen <grobian@gentoo.org>
Thu, 4 Jan 2018 15:16:28 +0000 (16:16 +0100)
On Darwin, gcc emits __ppc__ or __ppc64__, not __powerpc__.  Do
additionally allow the short variants to match, such that we can use the
wrapped packages on ppc-macos as well.

eclass/multilib-build.eclass

index 7c69f86b4699630c4e87f616dea0cb088067ee70..6356350c43b3b6926f733e1e6882aa310e1a0b89 100644 (file)
@@ -497,8 +497,8 @@ multilib_prepare_wrappers() {
 #      else
 #       error "abi_s390_32 not supported by the package."
 #      endif
-#elif defined(__powerpc__)
-#      if defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__ppc__)
+#      if defined(__powerpc64__) || defined(__ppc64__)
 #       error "abi_ppc_64 not supported by the package."
 #      else
 #       error "abi_ppc_32 not supported by the package."