Date: Sun, 17 Apr 2016 09:52:56 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413495 - head/emulators/wine Message-ID: <201604170952.u3H9qu79063576@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sun Apr 17 09:52:56 2016 New Revision: 413495 URL: https://svnweb.freebsd.org/changeset/ports/413495 Log: Force the use of GCC where it is the system compiler since COMPILER_VERSION will be 42 (the GCC version) even if clang is CHOSEN_COMPILER_TYPE in that case. PR: 206527 Modified: head/emulators/wine/Makefile Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Sun Apr 17 08:14:50 2016 (r413494) +++ head/emulators/wine/Makefile Sun Apr 17 09:52:56 2016 (r413495) @@ -118,7 +118,12 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fo CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" -.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 +# Force the use of GCC where it is the system compiler since +# COMPILER_VERSION will be 42 (the GCC version) even if clang +# is CHOSEN_COMPILER_TYPE in that case. +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 +USE_GCC= any +.elseif ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 CPPFLAGS+= -D__builtin_ms_va_list=__builtin_va_list \ -D__builtin_ms_va_start=__builtin_va_start \ -D__builtin_ms_va_end=__builtin_va_end \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604170952.u3H9qu79063576>