1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-23 06:39:01 +00:00

Separate CFLAGS from CXXFLAGS. Was breaking with -std=c++11 on clang

This commit is contained in:
dmiller
2016-07-06 16:20:56 +00:00
parent f58315fa59
commit 9058596e1e
3 changed files with 7 additions and 2 deletions

View File

@@ -47,8 +47,7 @@ DEFS += -D_FORTIFY_SOURCE=2
# DEFS += -DMTRACE=1
CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT)
CPPFLAGS = @CPPFLAGS@ $(DEFS)
export CFLAGS = $(CXXFLAGS)
# CFLAGS = $(DEFS) $(INCLS)
CFLAGS = @CFLAGS@ $(DBGFLAGS) $(CCOPT)
STATIC =
LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC)
LIBS = @LIBNSOCK_LIBS@ @LIBNBASE_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ $(OPENSSL_LIBS) libnetutil/libnetutil.a @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBLINEAR_LIBS@ @LIBS@

3
configure vendored
View File

@@ -4403,6 +4403,8 @@ if test -n "$GXX"; then
CXXFLAGS="$CXXFLAGS -Wall -fno-strict-aliasing"
fi
CFLAGS="$CFLAGS -Wall"
# Remember that all following tests will run with this CXXFLAGS by default
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__" >&5
$as_echo_n "checking for __func__... " >&6; }
@@ -6874,6 +6876,7 @@ fi
LIBLINEARDIR=liblinear
have_liblinear=no

View File

@@ -71,6 +71,8 @@ if test -n "$GXX"; then
CXXFLAGS="$CXXFLAGS -Wall -fno-strict-aliasing"
fi
CFLAGS="$CFLAGS -Wall"
# Remember that all following tests will run with this CXXFLAGS by default
AC_MSG_CHECKING(for __func__)
AH_TEMPLATE(__func__, [C99-specified function identifier])
@@ -680,6 +682,7 @@ AC_SUBST(LUA_DIST_CLEAN)
AC_SUBST(INSTALLNSE)
AC_SUBST(NSE_CHECK)
AC_SUBST(CXXFLAGS)
AC_SUBST(CFLAGS)
LIBLINEARDIR=liblinear