Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

Commit

Permalink
[osx/ios] remove ARCHTYPE, it is not needed anymore as -arch is passe…
Browse files Browse the repository at this point in the history
…d in LDFLAGS
  • Loading branch information
davilla committed May 11, 2011
1 parent 05a4fce commit 9da3bbd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Makefile.in
Expand Up @@ -361,9 +361,9 @@ lib/cpluff/libcpluff/.libs/libcpluff.a: force
system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a
ifeq ($(findstring osx,@ARCH@), osx)
ifeq (@ARCH@, arm-osx)
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $<
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -o $@ $<
else
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lexpat $(BUNDLE1_O) -o $@ $<
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -lexpat $(BUNDLE1_O) -o $@ $<
endif
else
cp lib/cpluff/libcpluff/.libs/libcpluff.so $@
Expand Down
8 changes: 0 additions & 8 deletions configure.in
Expand Up @@ -349,8 +349,6 @@ case $host in
fi
ARCH="arm-osx"
SYSROOT="-miphoneos-version-min=4.1 -isysroot $SDKROOT"
ARCHTYPE=$HOSTTYPE
AC_SUBST([ARCHTYPE])
AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
PYTHON_VERSION="2.6"
PYTHON_LDFLAGS="-L${prefix}/lib -lpython2.6"
Expand All @@ -366,9 +364,6 @@ case $host in
ARCH="x86-osx"
export MACOSX_DEPLOYMENT_TARGET=10.4
SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
# define i386 or x86_64, cannot use $HOSTTYPE as it reports x86_64 on 10.6 regardless of kernel flavor
ARCHTYPE=`uname -m`
AC_SUBST([ARCHTYPE])
;;
powerpc-apple-darwin*)
use_joystick=no
Expand All @@ -379,9 +374,6 @@ case $host in
use_arch="ppc"
export MACOSX_DEPLOYMENT_TARGET=10.4
SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
# define ppc
ARCHTYPE="ppc"
AC_SUBST([ARCHTYPE])
;;
powerpc-*-linux-gnu*)
ARCH="powerpc-linux"
Expand Down

0 comments on commit 9da3bbd

Please sign in to comment.