Attempting to allow compilation on GCC archs.  Just
a slight tweak and addition of a COMPILER list.

Tim.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile    29 Oct 2017 17:27:18 -0000      1.1.1.1
+++ Makefile    5 Nov 2017 16:49:36 -0000
@@ -20,6 +20,8 @@ FLAVOR?=
 WANTLIB=               ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c \
                        iconv intl m pthread
 
+COMPILER=              base-clang ports-gcc
+
 MODULES=               lang/lua \
                        textproc/intltool
 MODLUA_VERSION=                5.3
@@ -29,10 +31,10 @@ BUILD_DEPENDS=              devel/libexecinfo
 
 LIB_DEPENDS=           devel/gettext
 
-MAKE_ENV=              CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV=              CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
-MAKE_FLAGS=            CLANG="${CXX}" RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1 \
-                       LANGUAGES=all LUA=1 LUA_BINARY=${MODLUA_BIN}
+MAKE_FLAGS=            RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1 LANGUAGES=all \
+                       LUA=1 LUA_BINARY=${MODLUA_BIN}
 
 .if ${FLAVOR:Mno_x11}
 WANTLIB+=              ncurses

Reply via email to