Update patch forgotten in previous commit

This commit is contained in:
Johan van Selst 2015-01-15 10:39:45 +00:00
parent d98011693a
commit 0d970c4f39
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=377073

View file

@ -1,32 +1,32 @@
--- cnf/mak/afnix-freebsd.mak.orig 2013-05-04 18:23:18.000000000 +0200 --- cnf/mak/afnix-clg4.mak.orig 2015-01-09 13:27:16.000000000 +0100
+++ cnf/mak/afnix-freebsd.mak 2013-05-04 18:26:47.000000000 +0200 +++ cnf/mak/afnix-clg4.mak 2015-01-09 13:28:08.000000000 +0100
@@ -19,23 +19,23 @@ @@ -19,23 +19,23 @@
# - compiler and linker section - # - compiler and linker section -
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
-CC = g++ -CC = clang++
-LD = g++ -LD = clang++
-LK = g++ -LK = clang++
+CC = $(CXX) +CC = $(CXX)
+LD = $(CXX) +LD = $(CXX)
+LK = $(CXX) +LK = $(CXX)
AR = ar AR = ar
RANLIB = ranlib RANLIB = ranlib
STDEVFLAGS = STDEVFLAGS =
-STDCCFLAGS = -Wall -Werror -fno-builtin -STDCCFLAGS = -std=c++11 -Wall -Werror -Wno-overloaded-virtual -fno-builtin
+STDCCFLAGS = -Wall -W -fno-builtin +STDCCFLAGS = -std=c++11 -Wall -W -Wno-overloaded-virtual -fno-builtin
STACCFLAGS = STACCFLAGS =
DYNCCFLAGS = -fPIC DYNCCFLAGS = -fPIC
PLTCCFLAGS = PLTCCFLAGS =
DEBUGFLAGS = -g DEBUGFLAGS = -g
-OPTCCFLAGS = -O2 -OPTCCFLAGS = -O2
+OPTCCFLAGS = +OPTCCFLAGS =
PFLCCFLAGS = -g -pg PFLCCFLAGS =
COVCCFLAGS = -g -fprofile-arcs -ftest-coverage COVCCFLAGS =
CPPCCFLAGS = -nostdinc -nostdinc++ CPPCCFLAGS = -nostdinc -nostdinc++
CXXCCFLAGS = CXXCCFLAGS =
-STDDEFINES = -STDDEFINES =
+STDDEFINES = $(PTHREAD_CFLAGS) +STDDEFINES = $(PTHREAD_CFLAGS)
DBGDEFINES = -DAFNIX_DEBUG DBGDEFINES = -DAFNIX_DEBUG
OPTDEFINES = OPTDEFINES =
PFLDEFINES = -DAFNIX_DEBUG -DAFNIX_PROFILED PFLDEFINES =