firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Applied patch from Damyan Ivanov: no compiler flag repetinion when CXXFLAGS is set in the environment

Browse Source
This commit is contained in:
alexpeshkoff 2011-03-27 11:22:57 +00:00
parent 905cd74109
commit 2ce69ffac3
7 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builds/posix/make.rules
View File

@ -45,7 +45,8 @@ else
endif endif
WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS) WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS)
WCXXFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CXXFLAGS) # Firebird needs no RTTI
WCXXFLAGS:= $(WFLAGS) $(THR_FLAGS) -fno-rtti $(CXXFLAGS)
# Here we have definitions for using the preprocessor. # Here we have definitions for using the preprocessor.

3
builds/posix/prefix.example
View File

@ -6,6 +6,3 @@
if $(eq $(ModuleName), "intl") if $(eq $(ModuleName), "intl")
LIB_LINK_OPTIONS := -assert pure-text -assert nosymbolic LIB_LINK_OPTIONS := -assert pure-text -assert nosymbolic
endif endif
# Firebird needs no RTTI
CXXFLAGS:= $(CXXFLAGS) -fno-rtti

1
builds/posix/prefix.linux_amd64
View File

@ -21,7 +21,6 @@
COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof
CXXFLAGS:= $(CXXFLAGS) -fno-rtti
PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
#DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS) #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)

1
builds/posix/prefix.linux_generic
View File

@ -22,4 +22,3 @@ COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS) PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS)
DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
CXXFLAGS:= $(CXXFLAGS) -fno-rtti

1
builds/posix/prefix.linux_ia64
View File

@ -21,7 +21,6 @@
COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0
OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
CXXFLAGS:= $(CXXFLAGS) -fno-rtti
PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)

1
builds/posix/prefix.linux_sparc32
View File

@ -21,4 +21,3 @@
COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 $(COMMON_FLAGS) PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 $(COMMON_FLAGS)
DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
CXXFLAGS:= $(CXXFLAGS) -fno-rtti

5
configure.in
View File

@ -459,6 +459,7 @@ fi
dnl Find out how to use threads on this platform dnl Find out how to use threads on this platform
pre_acx_pthread_cflags=$CFLAGS pre_acx_pthread_cflags=$CFLAGS
pre_acx_pthread_cxxflags=$CXXFLAGS
pre_acx_pthread_libs=$LIBS pre_acx_pthread_libs=$LIBS
ACX_PTHREAD([ ACX_PTHREAD([
AC_DEFINE(HAVE_MULTI_THREAD, 1, AC_DEFINE(HAVE_MULTI_THREAD, 1,
@ -468,10 +469,6 @@ LIBS=$pre_acx_pthread_libs
AC_SUBST(PTHREAD_LIBS) AC_SUBST(PTHREAD_LIBS)
AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_CFLAGS)
dnl Later we always build threaded binaries
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
LIBS="$LIBS $PTHREAD_LIBS"
AC_ARG_ENABLE(raw-devices, AC_ARG_ENABLE(raw-devices,
[ --enable-raw-devices enable databases on raw devices (default on POSIX)], [ --enable-raw-devices enable databases on raw devices (default on POSIX)],