[Firebird-checkins] SF.net SVN: firebird:[52597] firebird/trunk

[<ale...@us...>]

Revision: 52597
          http://firebird.svn.sourceforge.net/firebird/?rev=52597&view=rev
Author:   alexpeshkoff
Date:     2011-03-27 11:22:57 +0000 (Sun, 27 Mar 2011)

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

Modified Paths:
--------------
    firebird/trunk/builds/posix/make.rules
    firebird/trunk/builds/posix/prefix.example
    firebird/trunk/builds/posix/prefix.linux_amd64
    firebird/trunk/builds/posix/prefix.linux_generic
    firebird/trunk/builds/posix/prefix.linux_ia64
    firebird/trunk/builds/posix/prefix.linux_sparc32
    firebird/trunk/configure.in

Modified: firebird/trunk/builds/posix/make.rules
===================================================================
--- firebird/trunk/builds/posix/make.rules	2011-03-23 03:31:44 UTC (rev 52596)
+++ firebird/trunk/builds/posix/make.rules	2011-03-27 11:22:57 UTC (rev 52597)
@@ -45,7 +45,8 @@
 endif
 
 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.
 

Modified: firebird/trunk/builds/posix/prefix.example
===================================================================
--- firebird/trunk/builds/posix/prefix.example	2011-03-23 03:31:44 UTC (rev 52596)
+++ firebird/trunk/builds/posix/prefix.example	2011-03-27 11:22:57 UTC (rev 52597)
@@ -6,6 +6,3 @@
 if $(eq $(ModuleName), "intl") 
     LIB_LINK_OPTIONS := -assert pure-text -assert nosymbolic 
 endif
-
-# Firebird needs no RTTI
-CXXFLAGS:= $(CXXFLAGS) -fno-rtti

Modified: firebird/trunk/builds/posix/prefix.linux_amd64
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_amd64	2011-03-23 03:31:44 UTC (rev 52596)
+++ firebird/trunk/builds/posix/prefix.linux_amd64	2011-03-27 11:22:57 UTC (rev 52597)
@@ -21,7 +21,6 @@
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
 OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
 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)
 #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)

Modified: firebird/trunk/builds/posix/prefix.linux_generic
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_generic	2011-03-23 03:31:44 UTC (rev 52596)
+++ firebird/trunk/builds/posix/prefix.linux_generic	2011-03-27 11:22:57 UTC (rev 52597)
@@ -22,4 +22,3 @@
 
 PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS)
 DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
-CXXFLAGS:= $(CXXFLAGS) -fno-rtti

Modified: firebird/trunk/builds/posix/prefix.linux_ia64
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_ia64	2011-03-23 03:31:44 UTC (rev 52596)
+++ firebird/trunk/builds/posix/prefix.linux_ia64	2011-03-27 11:22:57 UTC (rev 52597)
@@ -21,7 +21,6 @@
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0
 OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
 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)
 DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)

Modified: firebird/trunk/builds/posix/prefix.linux_sparc32
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_sparc32	2011-03-23 03:31:44 UTC (rev 52596)
+++ firebird/trunk/builds/posix/prefix.linux_sparc32	2011-03-27 11:22:57 UTC (rev 52597)
@@ -21,4 +21,3 @@
 COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
 PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 $(COMMON_FLAGS)
 DEV_FLAGS=-ggdb -p -Wall -Wno-switch  $(COMMON_FLAGS) -Wno-non-virtual-dtor
-CXXFLAGS:= $(CXXFLAGS) -fno-rtti

Modified: firebird/trunk/configure.in
===================================================================
--- firebird/trunk/configure.in	2011-03-23 03:31:44 UTC (rev 52596)
+++ firebird/trunk/configure.in	2011-03-27 11:22:57 UTC (rev 52597)
@@ -459,6 +459,7 @@
 
 dnl Find out how to use threads on this platform
 pre_acx_pthread_cflags=$CFLAGS
+pre_acx_pthread_cxxflags=$CXXFLAGS
 pre_acx_pthread_libs=$LIBS
 ACX_PTHREAD([
   AC_DEFINE(HAVE_MULTI_THREAD, 1,
@@ -468,10 +469,6 @@
 
 AC_SUBST(PTHREAD_LIBS)
 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,
   [  --enable-raw-devices    enable databases on raw devices (default on POSIX)],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.