1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Fix build in -current (build/link C++ code with ${CXX})

This commit is contained in:
Kris Kennaway 2002-09-09 01:01:26 +00:00
parent ae3accaccc
commit a508c32fd1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65870
2 changed files with 27 additions and 1 deletions

View File

@ -19,7 +19,7 @@ NO_INSTALL_MANPAGES= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 400012
MAKE_ENV= COPT="-fpermissive"
MAKE_ENV= COPT="${CXXFLAGS} -fpermissive"
.endif
post-extract:

View File

@ -0,0 +1,26 @@
--- Makefile.orig Sun Sep 8 17:09:50 2002
+++ Makefile Sun Sep 8 17:10:42 2002
@@ -1,18 +1,19 @@
I = -I${X11BASE}/include -I${LOCALBASE}/include
L = -L${LOCALBASE}/lib -L${X11BASE}/lib -L/usr/lib -lXpm -lX11 -lXext
-CC+= ${CFLAGS} ${COPT} $I -DXLIB_ILLEGAL_ACCESS
+CXX?= c++
+CXXFLAGS=${COPT} $I -DXLIB_ILLEGAL_ACCESS
all: xcyrBGR
xcyrBGR: xcyrBGR.o cyrmapper.o
- $(CC) xcyrBGR.o cyrmapper.o -o xcyrBGR $L
+ $(CXX) $(CXXFLAGS) xcyrBGR.o cyrmapper.o -o xcyrBGR $L
xcyrBGR.o: xcyrBGR.cc
- $(CC) xcyrBGR.cc -c -o xcyrBGR.o
+ $(CXX) $(CXXFLAGS) xcyrBGR.cc -c -o xcyrBGR.o
cyrmapper.o: cyrmapper.cc cyrmapper.h
- $(CC) cyrmapper.cc -c -o cyrmapper.o
+ $(CXX) $(CXXFLAGS) cyrmapper.cc -c -o cyrmapper.o
clean:
rm *.o xcyrBGR