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 769772 - Print compiler version being used and drop checks for llvm-gcc and old versions of clang. r=khuey.

Browse Source
This commit is contained in:
Rafael Ávila de Espíndola 2012-07-03 08:27:18 -04:00
parent bc682c2957
commit e6050ef2f4
3 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -131,7 +131,6 @@ MOZ_WAVE = @MOZ_WAVE@
MOZ_MEDIA = @MOZ_MEDIA@
MOZ_VORBIS = @MOZ_VORBIS@
MOZ_TREMOR = @MOZ_TREMOR@
MOZ_NO_THEORA_ASM = @MOZ_NO_THEORA_ASM@
MOZ_OPUS = @MOZ_OPUS@
MOZ_WEBM = @MOZ_WEBM@
MOZ_MEDIA_PLUGINS = @MOZ_MEDIA_PLUGINS@

40
configure.in
View File

@ -1026,42 +1026,10 @@ fi
fi # COMPILE_ENVIRONMENT
dnl clang prior to 2.9 (including Xcode 4) does not support all the
dnl constructs required by the libtheora inline asm. This is used to
dnl detect and disable it
AC_MSG_CHECKING([whether the C compiler is clang older than version 2.9])
AC_LANG_SAVE
AC_LANG_C
AC_TRY_COMPILE([
#if defined(__clang__)
# if __clang_major__<2 || (__clang_major__==2 && __clang_minor__<9)
# error "clang older than 2.9 detected"
# endif
#endif
],
[],
result="no",
result="yes")
AC_LANG_RESTORE
AC_MSG_RESULT([$result])
if test "$result" = "yes"; then
MOZ_NO_THEORA_ASM=1
fi
dnl XCode 4.2 also shipped an llvm-gcc which couldn't compile
dnl the libtheora inline asm.
AC_MSG_CHECKING([bad gcc versions])
if `$CC --version | grep -q "Apple Inc. build 5658"`; then
AC_MSG_RESULT([Apple build 5658])
MOZ_NO_THEORA_ASM=1
else
AC_MSG_RESULT([we're ok])
fi
AC_SUBST(MOZ_NO_THEORA_ASM)
if test "x$MOZ_NO_THEORA_ASM" = x1; then
AC_MSG_WARN([Disabling libtheora inline assembly])
fi
AC_MSG_CHECKING([compiler version])
# Just print it so it shows up in the logs.
cc_version=$($CC --version)
AC_MSG_RESULT([$cc_version])
if test -n "$MAKE"; then
if test `echo $MAKE | grep -c make.py` != 1; then

4
media/libtheora/lib/Makefile.in
View File

@ -21,7 +21,6 @@ DEFINES += -DTHEORA_DISABLE_ENCODE
ifeq ($(findstring 86,$(OS_TEST)), 86)
ifneq ($(OS_ARCH),SunOS)
ifneq ($(OS_ARCH)$(OS_TEST),WINNTx86_64)
ifndef MOZ_NO_THEORA_ASM
DEFINES += -DOC_X86_ASM
ifeq (64,$(findstring 64,$(OS_TEST)))
DEFINES += -DOC_X86_64_ASM
@ -29,7 +28,6 @@ endif
endif
endif
endif
endif
VPATH := $(srcdir)
@ -63,7 +61,6 @@ CSRCS += \
$(NULL)
endif
else
ifndef MOZ_NO_THEORA_ASM
VPATH += $(srcdir)/x86
CSRCS += \
@ -76,7 +73,6 @@ CSRCS += \
$(NULL)
endif
endif
endif
ifdef GNU_AS
ifeq ($(findstring arm,$(OS_TEST)), arm)