aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-04-06 15:06:34 -0700
committerGuy Harris <guy@alum.mit.edu>2010-04-06 15:06:34 -0700
commite45fc489f01ba13cf400f76ed45cbe1e70c17a6f (patch)
treeb6b0407185370d8a0854b691e520b892ab9bf001
parenta1a7640419b309ea1286398e4d45dc006f46115f (diff)
Build fat appropriately for Leopard.
-rwxr-xr-xconfigure16
-rw-r--r--configure.in16
2 files changed, 26 insertions, 6 deletions
diff --git a/configure b/configure
index e4caa27..a2d96d5 100755
--- a/configure
+++ b/configure
@@ -9549,12 +9549,22 @@ fi
if test "$enable_universal" != "no"; then
case "$host_os" in
+ darwin9.*)
+ #
+ # Leopard. Build for 32-bit PowerPC, 64-bit
+ # PowerPC, x86, and x86-64, with 32-bit PowerPC
+ # first. (That's what Apple does.)
+ #
+ V_CCOPT="$V_CCOPT -arch ppc -arch ppc64 -arch i386 -arch x86_64"
+ LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386 -arch x86_64"
+ ;;
+
darwin10.*)
#
# Snow Leopard. Build for x86-64, x86, and
- # PPC, with x86-64 first. (That's what Apple
- # does, even though Snow Leopard doesn't
- # run on PPC, so PPC libpcap runs under
+ # 32-bit PowerPC, with x86-64 first. (That's
+ # what Apple does, even though Snow Leopard
+ # doesn't run on PPC, so PPC libpcap runs under
# Rosetta, and Rosetta doesn't support BPF
# ioctls, so PPC programs can't do live
# captures.)
diff --git a/configure.in b/configure.in
index 2a0ddf1..43ea7cb 100644
--- a/configure.in
+++ b/configure.in
@@ -1174,12 +1174,22 @@ darwin*)
if test "$enable_universal" != "no"; then
case "$host_os" in
+ darwin9.*)
+ #
+ # Leopard. Build for 32-bit PowerPC, 64-bit
+ # PowerPC, x86, and x86-64, with 32-bit PowerPC
+ # first. (That's what Apple does.)
+ #
+ V_CCOPT="$V_CCOPT -arch ppc -arch ppc64 -arch i386 -arch x86_64"
+ LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386 -arch x86_64"
+ ;;
+
darwin10.*)
#
# Snow Leopard. Build for x86-64, x86, and
- # PPC, with x86-64 first. (That's what Apple
- # does, even though Snow Leopard doesn't
- # run on PPC, so PPC libpcap runs under
+ # 32-bit PowerPC, with x86-64 first. (That's
+ # what Apple does, even though Snow Leopard
+ # doesn't run on PPC, so PPC libpcap runs under
# Rosetta, and Rosetta doesn't support BPF
# ioctls, so PPC programs can't do live
# captures.)