firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

We perform C++, not plain C compilation - therefore ese CXXFLAGS instead of CFLAGS

Browse Source
This commit is contained in:
alexpeshkoff 2009-08-07 13:29:02 +00:00
parent 6a10a7df17
commit 46e7388ecc
15 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/posix/Makefile.in.boot.gpre
View File

@ -30,7 +30,7 @@
#
ROOT=..
ObjModuleType=boot
CFLAGS += -DBOOT_BUILD
CXXFLAGS+= -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.client.fbudf
View File

@ -30,7 +30,7 @@
#
ROOT=..
ObjModuleType=superclient
CFLAGS+=-DSUPERCLIENT
CXXFLAGS+= -DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.embed.fbudf
View File

@ -30,7 +30,7 @@
#
ROOT=..
ObjModuleType=superclient
CFLAGS+=-DSUPERCLIENT
CXXFLAGS+= -DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.fbserver
View File

@ -29,7 +29,7 @@
#
ROOT=..
ObjModuleType=superserver
CFLAGS+=-DSUPERSERVER
CXXFLAGS+= -DSUPERSERVER
ArchType=super
include $(ROOT)/gen/make.defaults

2
builds/posix/Makefile.in.fbtrace
View File

@ -30,7 +30,7 @@
#
ROOT=..
ObjModuleType=superclient
CFLAGS+=-DSUPERCLIENT
CXXFLAGS+= -DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.intl
View File

@ -30,7 +30,7 @@
#
ROOT=..
ObjModuleType=superclient
CFLAGS+=-DSUPERCLIENT
CXXFLAGS+= -DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.libfbclient
View File

@ -30,7 +30,7 @@
#
ROOT=..
ObjModuleType=superclient
CFLAGS+=-DSUPERCLIENT
CXXFLAGS+= -DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.libfbstatic
View File

@ -30,7 +30,7 @@
#
ROOT=..
ObjModuleType=boot
CFLAGS+=-DBOOT_BUILD
CXXFLAGS+= -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.smp_server
View File

@ -29,7 +29,7 @@
#
ROOT=..
ObjModuleType=superserver
CFLAGS+=-DSUPERSERVER
CXXFLAGS+= -DSUPERSERVER
ArchType=super
include $(ROOT)/gen/make.defaults

2
builds/posix/Makefile.in.static.gbak
View File

@ -29,7 +29,7 @@
#
ROOT=..
ObjModuleType=boot
CFLAGS += -DBOOT_BUILD
CXXFLAGS+= -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.static.gpre
View File

@ -29,7 +29,7 @@
#
ROOT=..
ObjModuleType=boot
CFLAGS += -DBOOT_BUILD
CXXFLAGS+= -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

2
builds/posix/Makefile.in.static.isql
View File

@ -30,7 +30,7 @@
#
ROOT=..
ObjModuleType=boot
CFLAGS+= -DBOOT_BUILD
CXXFLAGS+= -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

11
builds/posix/make.rules
View File

@ -32,20 +32,21 @@
# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
WCFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan \
WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan \
-DNAMESPACE=Vulcan
ifeq ($(STD_ICU),false)
WCFLAGS:= $(WCFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
WFLAGS:= $(WFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
endif
ifeq ($(IsProdTypeBuild),Y)
WCFLAGS:= $(WCFLAGS) $(PROD_FLAGS)
WFLAGS:= $(WFLAGS) $(PROD_FLAGS)
else
WCFLAGS:= $(WCFLAGS) $(DEV_FLAGS) -DDEV_BUILD
WFLAGS:= $(WFLAGS) $(DEV_FLAGS) -DDEV_BUILD
endif
WCXXFLAGS:= $(CXXFLAGS) $(WCFLAGS)
WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS)
WCXXFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CXXFLAGS)
# Here we have definitions for using the preprocessor.

6
builds/posix/prefix.solaris
View File

@ -54,7 +54,7 @@
# libC and libCrun need libthread for a multithreaded application
COMMON_FLAGS= -DSOLARIS -DBSD_COMP -D__EXTENSIONS__ \
-D_POSIX_THREAD_SEMANTICS -D_POSIX_THREAD_PRIO_INHERIT -D_POSIX_C_SOURCE=199506L \
-mt -KPIC \
-KPIC \
-erroff=wvarhidemem $(ATOMIC_OPTIONS)
# if we keep sfio this needs to be set by configure (or move in to extern directory)
@ -93,8 +93,8 @@ LIB_LINK_SONAME= -h $(1)
LIB_LINK_MAPFILE= -M
# link options for Solaris linker, /usr/ccs/bin/ld
LINK_OPTS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -mt -library=no%Cstd,Crun
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -mt -G -library=no%Cstd,Crun
LINK_OPTS+= -library=no%Cstd,Crun
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -G -library=no%Cstd,Crun
# static link of client library uses c++ compiler and -staticlib=Crun
CLIENTLIB_LINK= $(CXX) $(GLOB_OPTIONS)

10
configure.in
View File

@ -273,8 +273,11 @@ dnl CPU_TYPE=ppc64
dnl detect native compiler, Sun Studio Pro
comp=`echo "$CXX" | cut -c1-2`
case $comp in
CC) MAKEFILE_PREFIX=solaris ;
ICU_PLATFORM=SOLARISX86 ;;
CC) MAKEFILE_PREFIX=solaris
ICU_PLATFORM=SOLARISX86
PTHREAD_CFLAGS=-mt
PTHREAD_LIBS=-lpthread
;;
*) MAKEFILE_PREFIX=solx86gcc ;
ICU_PLATFORM=SOLARISX86GCC ;
PTHREAD_CFLAGS=-pthreads ;;
@ -298,6 +301,8 @@ dnl CPU_TYPE=ppc64
CC) MAKEFILE_PREFIX=solaris ;
ICU_PLATFORM=SOLARISCC
dnl inline assembly for atomic operations on Solaris 9 w SSPRO
PTHREAD_CFLAGS=-mt
PTHREAD_LIBS=-lpthread
if test "${target#*solaris}" = "2.9"; then
ATOMIC_OPTIONS="../src/common/classes/fb_atomic.il";
fi
@ -389,6 +394,7 @@ 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,