wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 641232 - Make HAS_XCODE_2_1 detection compatible with Xcode 4 - Remove unused configure bits. r=khuey

Browse Source
This commit is contained in:
Rafael Avila de Espindola 2011-06-20 10:40:58 +01:00
parent 31537c4e57
commit ddc2ddc4ac
6 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/autoconf.mk.in
View File

@ -666,8 +666,6 @@ LIBCONIC_LIBS = @LIBCONIC_LIBS@
MACOS_SDK_DIR = @MACOS_SDK_DIR@
NEXT_ROOT = @NEXT_ROOT@
GCC_VERSION = @GCC_VERSION@
XCODEBUILD_VERSION= @XCODEBUILD_VERSION@
HAS_XCODE_2_1 = @HAS_XCODE_2_1@
UNIVERSAL_BINARY= @UNIVERSAL_BINARY@
HAVE_DTRACE= @HAVE_DTRACE@

7
config/config.mk
View File

@ -591,13 +591,6 @@ ifeq (2,$(MOZ_OPTIMIZE))
PBBUILD_SETTINGS += GCC_MODEL_TUNING= OPTIMIZATION_CFLAGS="$(MOZ_OPTIMIZE_FLAGS)"
endif # MOZ_OPTIMIZE=2
endif # MOZ_OPTIMIZE
ifeq (1,$(HAS_XCODE_2_1))
# Xcode 2.1 puts its build products in a directory corresponding to the
# selected build style/configuration.
XCODE_PRODUCT_DIR = build/$(BUILDSTYLE)
else
XCODE_PRODUCT_DIR = build
endif # HAS_XCODE_2_1=1
endif # OS_ARCH=Darwin

13
configure.in
View File

@ -1014,17 +1014,6 @@ from building Mozilla. Upgrade to Xcode 2.1 or later.])
dnl /usr/bin/g(cc|++)-$GCC_VERSION.
MOZ_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
case "$PBBUILD" in
*xcodebuild*)
changequote(,)
XCODEBUILD_VERSION=`$PBBUILD -version 2>/dev/null | xargs | sed -e 's/.*DevToolsCore-\([0-9]*\).*/\1/'`
changequote([,])
if test -n "$XCODEBUILD_VERSION" && test "$XCODEBUILD_VERSION" -ge 620 ; then
HAS_XCODE_2_1=1;
fi
;;
esac
dnl sdp was formerly in /Developer/Tools. As of Mac OS X 10.4 (Darwin 8),
dnl it has moved into /usr/bin.
MOZ_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
@ -1032,8 +1021,6 @@ from building Mozilla. Upgrade to Xcode 2.1 or later.])
esac
AC_SUBST(GCC_VERSION)
AC_SUBST(XCODEBUILD_VERSION)
AC_SUBST(HAS_XCODE_2_1)
dnl The universal machinery sets UNIVERSAL_BINARY to inform packager.mk
dnl that a universal binary is being produced.

2
js/src/config/autoconf.mk.in
View File

@ -323,8 +323,6 @@ QEMU_CANT_RUN_JS_SHELL = @QEMU_CANT_RUN_JS_SHELL@
MACOS_SDK_DIR = @MACOS_SDK_DIR@
NEXT_ROOT = @NEXT_ROOT@
GCC_VERSION = @GCC_VERSION@
XCODEBUILD_VERSION= @XCODEBUILD_VERSION@
HAS_XCODE_2_1 = @HAS_XCODE_2_1@
UNIVERSAL_BINARY= @UNIVERSAL_BINARY@
HAVE_DTRACE= @HAVE_DTRACE@

7
js/src/config/config.mk
View File

@ -591,13 +591,6 @@ ifeq (2,$(MOZ_OPTIMIZE))
PBBUILD_SETTINGS += GCC_MODEL_TUNING= OPTIMIZATION_CFLAGS="$(MOZ_OPTIMIZE_FLAGS)"
endif # MOZ_OPTIMIZE=2
endif # MOZ_OPTIMIZE
ifeq (1,$(HAS_XCODE_2_1))
# Xcode 2.1 puts its build products in a directory corresponding to the
# selected build style/configuration.
XCODE_PRODUCT_DIR = build/$(BUILDSTYLE)
else
XCODE_PRODUCT_DIR = build
endif # HAS_XCODE_2_1=1
endif # OS_ARCH=Darwin

13
js/src/configure.in
View File

@ -1036,17 +1036,6 @@ from building Mozilla. Upgrade to Xcode 2.1 or later.])
dnl /usr/bin/g(cc|++)-$GCC_VERSION.
MOZ_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
case "$PBBUILD" in
*xcodebuild*)
changequote(,)
XCODEBUILD_VERSION=`$PBBUILD -version 2>/dev/null | xargs | sed -e 's/.*DevToolsCore-\([0-9]*\).*/\1/'`
changequote([,])
if test -n "$XCODEBUILD_VERSION" && test "$XCODEBUILD_VERSION" -ge 620 ; then
HAS_XCODE_2_1=1;
fi
;;
esac
dnl sdp was formerly in /Developer/Tools. As of Mac OS X 10.4 (Darwin 8),
dnl it has moved into /usr/bin.
MOZ_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
@ -1054,8 +1043,6 @@ from building Mozilla. Upgrade to Xcode 2.1 or later.])
esac
AC_SUBST(GCC_VERSION)
AC_SUBST(XCODEBUILD_VERSION)
AC_SUBST(HAS_XCODE_2_1)
dnl The universal machinery sets UNIVERSAL_BINARY to inform packager.mk
dnl that a universal binary is being produced.