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

Fixed CORE-3677: Stop utilities to export entrypoints

This commit is contained in:
alexpeshkoff 2011-12-27 08:14:58 +00:00
parent aa5db0e3e5
commit 4780466fcd
22 changed files with 52 additions and 53 deletions

View File

@ -149,7 +149,7 @@ $(COMMON_LIB): $(Common_Objects)
boot: $(GPRE_BOOT) boot: $(GPRE_BOOT)
$(GPRE_BOOT): $(GPRE_Boot_Objects) $(COMMON_LIB) $(GPRE_BOOT): $(GPRE_Boot_Objects) $(COMMON_LIB)
$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(STATICEXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
-$(RM) $(GPRE_CURRENT) -$(RM) $(GPRE_CURRENT)
(cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT))) (cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))
@ -205,7 +205,7 @@ $(LIBFBINTL_SO): $(INTL_Objects) $(COMMON_LIB)
gpre: $(GPRE) databases gpre: $(GPRE) databases
$(GPRE): $(GPRE_Objects) $(COMMON_LIB) $(GPRE): $(GPRE_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
HELP_FDB = $(FIREBIRD)/help/help.fdb HELP_FDB = $(FIREBIRD)/help/help.fdb
SECURITY_FDB = $(FIREBIRD)/security3.fdb SECURITY_FDB = $(FIREBIRD)/security3.fdb
@ -295,64 +295,62 @@ utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix g
firebird_server: $(FB_DAEMON) firebird_server: $(FB_DAEMON)
$(FB_DAEMON): $(Remote_Server_Objects) $(COMMON_LIB) $(FB_DAEMON): $(Remote_Server_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
fb_lock_print: $(LOCKPRINT) fb_lock_print: $(LOCKPRINT)
$(LOCKPRINT): $(LOCKPRINT_Objects) $(COMMON_LIB) $(LOCKPRINT): $(LOCKPRINT_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
fbguard: $(FBGUARD) fbguard: $(FBGUARD)
$(FBGUARD): $(FBGUARD_Objects) $(COMMON_LIB) $(FBGUARD): $(FBGUARD_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
fbsvcmgr: $(FBSVCMGR) fbsvcmgr: $(FBSVCMGR)
$(FBSVCMGR): $(FBSVCMGR_Objects) $(COMMON_LIB) $(FBSVCMGR): $(FBSVCMGR_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
#$(FBSVCMGR): $(FBSVCMGR_Objects) $(YValve_Objects) $(Remote_Client_Objects) $(COMMON_LIB)
# $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS)
fbtracemgr: $(FBTRACEMGR) fbtracemgr: $(FBTRACEMGR)
$(FBTRACEMGR): $(FBTRACEMGR_Objects) $(COMMON_LIB) $(FBTRACEMGR): $(FBTRACEMGR_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
gbak: $(GBAK) gbak: $(GBAK)
$(GBAK): $(GBAK_Objects) $(COMMON_LIB) $(GBAK): $(GBAK_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
gsplit: $(GSPLIT) gsplit: $(GSPLIT)
$(GSPLIT): $(GSPLIT_Objects) $(COMMON_LIB) $(GSPLIT): $(GSPLIT_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
gfix: $(GFIX) gfix: $(GFIX)
$(GFIX): $(GFIX_Objects) $(COMMON_LIB) $(GFIX): $(GFIX_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
gsec: $(GSEC) gsec: $(GSEC)
$(GSEC): $(GSEC_Objects) $(COMMON_LIB) $(GSEC): $(GSEC_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
gstat: $(GSTAT) gstat: $(GSTAT)
$(GSTAT): $(GSTAT_Objects) $(COMMON_LIB) $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
isql: $(ISQL) isql: $(ISQL)
$(ISQL): $(ISQL_Objects) $(COMMON_LIB) $(ISQL): $(ISQL_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(LIBEDITLINE) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(LIBEDITLINE)
nbackup: $(NBACKUP) nbackup: $(NBACKUP)
$(NBACKUP): $(NBACKUP_Objects) $(COMMON_LIB) $(NBACKUP): $(NBACKUP_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
#___________________________________________________________________________ #___________________________________________________________________________
@ -415,7 +413,7 @@ gen_codes: $(CODES) msg.timestamp
$(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT) $(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT)
$(CODES): $(CODES_Objects) $(COMMON_LIB) $(CODES): $(CODES_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
$(IDS): $(SRC_ROOT)/misc/ids.m $(SRC_ROOT)/jrd/relations.h $(IDS): $(SRC_ROOT)/misc/ids.m $(SRC_ROOT)/jrd/relations.h
m4 $< > $@ m4 $< > $@
@ -432,7 +430,7 @@ rest: qli message_file
qli: $(QLI) qli: $(QLI)
$(QLI): $(QLI_Objects) $(COMMON_LIB) $(QLI): $(QLI_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
examples: include_generic examples: include_generic
$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/ $(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
@ -445,7 +443,7 @@ $(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp
$(CHMOD_6) $@ $(CHMOD_6) $@
$(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB) $(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------

View File

@ -60,6 +60,7 @@ export PATH
GPRE_FLAGS= -r -m -z -n GPRE_FLAGS= -r -m -z -n
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl)) LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl))
LIB_LINK_MAPFILE =
EXAMPLES_DEST= $(GEN_ROOT)/examples EXAMPLES_DEST= $(GEN_ROOT)/examples
EXAMPLES_SRC= $(ROOT)/examples EXAMPLES_SRC= $(ROOT)/examples
@ -130,7 +131,7 @@ $(EXAMPLES_DEST)/isql$(EXEC_EXT):
$(LN) $(ISQL) $(EXAMPLES_DEST)/isql$(EXEC_EXT) $(LN) $(ISQL) $(EXAMPLES_DEST)/isql$(EXEC_EXT)
$(EXAMPLES_DEST)/empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(COMMON_LIB) $(EXAMPLES_DEST)/empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ -L$(LIB) $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
$(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_DEST)/empbuild.fdb $(EXAMPLES_DEST)/empbuild.e $(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_DEST)/empbuild.fdb $(EXAMPLES_DEST)/empbuild.e
@ -148,7 +149,7 @@ $(EXAMPLES_DEST)/intlemp.fdb: $(EXAMPLES_DEST)/intlbld$(EXEC_EXT) $(INTL_Sources
-$(CHMOD_6) intlemp.fdb -$(CHMOD_6) intlemp.fdb
$(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_LIB) $(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) @^ -o $@ -L$(LIB) $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) @^ -o $@ -L$(LIB) $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
$(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_DEST)/intlbuild.fdb $(EXAMPLES_DEST)/intlbld.e $(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_DEST)/intlbuild.fdb $(EXAMPLES_DEST)/intlbld.e

View File

@ -22,7 +22,7 @@
LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress
LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib -flat_namespace LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib -flat_namespace
LIB_LINK_SONAME:=-current_version @FIREBIRD_VERSION@ -compatibility_version @FIREBIRD_VERSION@ -seg1addr 0x30000000 LIB_LINK_SONAME:=-current_version @FIREBIRD_VERSION@ -compatibility_version @FIREBIRD_VERSION@ -seg1addr 0x30000000
LIB_LINK_MAPFILE:=-Wl,-exported_symbols_list, LIB_LINK_MAPFILE:=-Wl,-exported_symbols_list,$(1)
LIB_LINK_RPATH:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Libraries/ LIB_LINK_RPATH:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Libraries/
LIB_EMBED_LINK_OPTIONS:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Firebird LIB_EMBED_LINK_OPTIONS:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Firebird

View File

@ -262,12 +262,12 @@ PLUGIN_VERS = fbplugin.vers
ALLVERS = $(FIREBIRD_VERS) $(FBINTL_VERS) $(IB_UTIL_VERS) ALLVERS = $(FIREBIRD_VERS) $(FBINTL_VERS) $(IB_UTIL_VERS)
ALLVERS += $(UDR_ENGINE_VERS) $(EMPTY_VERS) $(PLUGIN_VERS) ALLVERS += $(UDR_ENGINE_VERS) $(EMPTY_VERS) $(PLUGIN_VERS)
LINK_FIREBIRD_SYMBOLS = $(LIB_LINK_MAPFILE)$(FIREBIRD_VERS) LINK_FIREBIRD_SYMBOLS = $(call LIB_LINK_MAPFILE,$(FIREBIRD_VERS))
LINK_FBINTL_SYMBOLS = $(LIB_LINK_MAPFILE)$(FBINTL_VERS) LINK_FBINTL_SYMBOLS = $(call LIB_LINK_MAPFILE,$(FBINTL_VERS))
LINK_IBUTIL_SYMBOLS = $(LIB_LINK_MAPFILE)$(IB_UTIL_VERS) LINK_IBUTIL_SYMBOLS = $(call LIB_LINK_MAPFILE,$(IB_UTIL_VERS))
LINK_UDRENG_SYMBOLS = $(LIB_LINK_MAPFILE)$(UDR_ENGINE_VERS) LINK_UDRENG_SYMBOLS = $(call LIB_LINK_MAPFILE,$(UDR_ENGINE_VERS))
LINK_EMPTY_SYMBOLS = $(LIB_LINK_MAPFILE)$(EMPTY_VERS) LINK_EMPTY_SYMBOLS = $(call LIB_LINK_MAPFILE,$(EMPTY_VERS))
LINK_PLUGIN_SYMBOLS = $(LIB_LINK_MAPFILE)$(PLUGIN_VERS) LINK_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,$(PLUGIN_VERS))
LINK_EXEC_EXPORT=-rdynamic LINK_EXEC_EXPORT=-rdynamic
LIB_PLATFORM_RPATH = -Wl,-rpath,$(1) LIB_PLATFORM_RPATH = -Wl,-rpath,$(1)
@ -283,10 +283,10 @@ else
endif endif
LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl) LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl)
LIB_LINK_SONAME= -Wl,-soname,$(1) LIB_LINK_SONAME= -Wl,-soname,$(1)
LIB_LINK_MAPFILE= -Wl,--version-script, LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient
LINK_OPTS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(LINK_EMPTY_SYMBOLS)
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
FB_DAEMON = $(BIN)/firebird$(EXEC_EXT) FB_DAEMON = $(BIN)/firebird$(EXEC_EXT)

View File

@ -37,6 +37,6 @@ endif
LIB_LINK_OPTIONS= -G LIB_LINK_OPTIONS= -G
LIB_PLATFORM_RPATH= -R $(1) LIB_PLATFORM_RPATH= -R $(1)
LIB_LINK_SONAME= -h $(1) LIB_LINK_SONAME= -h $(1)
LIB_LINK_MAPFILE= -Xlinker -M LIB_LINK_MAPFILE= -Xlinker -M$(1)
UNDEF_PLATFORM = -Wl,-z,defs UNDEF_PLATFORM = -Wl,-z,defs

View File

@ -62,13 +62,13 @@ PROD_FLAGS=-ggdb -O3 -fsigned-char -fmessage-length=0 -fno-omit-frame-pointer -p
DEV_FLAGS=-ggdb -O0 -fsigned-char -fmessage-length=0 -pipe -MMD -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -O0 -fsigned-char -fmessage-length=0 -pipe -MMD -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-non-virtual-dtor
# link options when using IBM /usr/bin/ld fronted by g++ # link options when using IBM /usr/bin/ld fronted by g++
LINK_OPTS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -Wl,-bbigtoc,-brtl EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -Wl,-bbigtoc,-brtl
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(LIB_PATH_OPTS) -shared -Wl,-G,-bbigtoc LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(LIB_PATH_OPTS) -shared -Wl,-G,-bbigtoc
# AIX ld uses "export files" to manage symbol visibility. Export files are # AIX ld uses "export files" to manage symbol visibility. Export files are
# functionally similar to "version files" on ELF systems and are specified # functionally similar to "version files" on ELF systems and are specified
# with the "-Wl,-bE:exportfile.exp" option. # with the "-Wl,-bE:exportfile.exp" option.
LIB_LINK_MAPFILE=-Wl,-bE: LIB_LINK_MAPFILE=-Wl,-bE:$(1)
# These options aren't used by AIX (XCOFF) object files... # These options aren't used by AIX (XCOFF) object files...
LIB_LINK_RPATH= LIB_LINK_RPATH=

View File

@ -86,7 +86,7 @@ PROD_FLAGS=$(COMMON_FLAGS) -O -qstaticinline -qmaxmem=-1 \
DEV_FLAGS=$(COMMON_FLAGS) -g \ DEV_FLAGS=$(COMMON_FLAGS) -g \
-qcheck -qformat=noall:exarg:zln -qcheck -qformat=noall:exarg:zln
LINK_OPTS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -brtl EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -brtl
# -G is shorthand to create shared objects with run-time linking. -G includes # -G is shorthand to create shared objects with run-time linking. -G includes
# -berok, -brtl, -bnosymbolic, -bnortllib, -bnoautoexp, -bM:SRE # -berok, -brtl, -bnosymbolic, -bnortllib, -bnoautoexp, -bM:SRE
@ -96,7 +96,7 @@ LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(LIB_PATH_OPTS) -G -bnoentry -qmkshro
# AIX ld uses "export files" to manage symbol visibility. Export files are # AIX ld uses "export files" to manage symbol visibility. Export files are
# functionally similar to "version files" on ELF systems and are specified # functionally similar to "version files" on ELF systems and are specified
# with the "-bE:exportfile.exp" option. # with the "-bE:exportfile.exp" option.
LIB_LINK_MAPFILE=-bE: LIB_LINK_MAPFILE=-bE:$(1)
# These options aren't used by AIX (XCOFF) object files... # These options aren't used by AIX (XCOFF) object files...
LIB_LINK_RPATH= LIB_LINK_RPATH=

View File

@ -34,7 +34,7 @@ PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-vers
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6 -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6 -Wno-non-virtual-dtor
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
LINK_OPTS:=-m32 EXE_LINK_OPTIONS:=-m32
LD_FLAGS+=-m32 -arch i386 LD_FLAGS+=-m32 -arch i386
include $(ROOT)/gen/darwin.defaults include $(ROOT)/gen/darwin.defaults

View File

@ -27,6 +27,6 @@ PROD_FLAGS=-DDARWIN -pipe -p -MMD -fPIC -fno-common -arch ppc -mmacosx-version-m
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch ppc -mmacosx-version-min=10.2 -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch ppc -mmacosx-version-min=10.2 -Wno-non-virtual-dtor
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
LINK_OPTS:= EXE_LINK_OPTIONS:=
include $(ROOT)/gen/darwin.defaults include $(ROOT)/gen/darwin.defaults

View File

@ -39,7 +39,7 @@ PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.5 -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.5 -Wno-non-virtual-dtor
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
LINK_OPTS:=-arch ppc64 EXE_LINK_OPTIONS:=-arch ppc64
LD_FLAGS+=-arch ppc64 LD_FLAGS+=-arch ppc64
include $(ROOT)/gen/darwin.defaults include $(ROOT)/gen/darwin.defaults

View File

@ -29,7 +29,7 @@ PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6 -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6 -Wno-non-virtual-dtor
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
LINK_OPTS:= EXE_LINK_OPTIONS:=
LD_FLAGS+= LD_FLAGS+=
include $(ROOT)/gen/darwin.defaults include $(ROOT)/gen/darwin.defaults

View File

@ -18,7 +18,7 @@
# #
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
LINK_OPTS+=-Wl,-rpath,../gen/firebird/lib EXE_LINK_OPTIONS+=-Wl,-rpath,../gen/firebird/lib
PROD_FLAGS=-O -fno-builtin -DFREEBSD -pipe -MMD -fPIC PROD_FLAGS=-O -fno-builtin -DFREEBSD -pipe -MMD -fPIC
DEV_FLAGS=-ggdb -DFREEBSD -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -DFREEBSD -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor

View File

@ -18,7 +18,7 @@
# #
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
LINK_OPTS+=-Wl,-rpath,../gen/firebird/lib EXE_LINK_OPTIONS+=-Wl,-rpath,../gen/firebird/lib
PROD_FLAGS=-O -fno-builtin -DFREEBSD -DAMD64 -pipe -MMD -fPIC PROD_FLAGS=-O -fno-builtin -DFREEBSD -DAMD64 -pipe -MMD -fPIC
DEV_FLAGS=-ggdb -DFREEBSD -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor DEV_FLAGS=-ggdb -DFREEBSD -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor

View File

@ -25,6 +25,6 @@ DEV_FLAGS= -ggdb -pipe -fPIC -MMD -DHP11 -DHPUX -D_HPUX_SOURCE -D_XOPEN_SOURCE_E
LIB_LINK_OPTIONS= -fPIC -shared LIB_LINK_OPTIONS= -fPIC -shared
LIB_LINK_RPATH= -Wl,+b,$(1) LIB_LINK_RPATH= -Wl,+b,$(1)
LIB_LINK_SONAME= -Wl,+h,$(1) LIB_LINK_SONAME= -Wl,+h,$(1)
LIB_LINK_MAPFILE= -Wl,-c, LIB_LINK_MAPFILE= -Wl,-c,$(1)
UNDEF_PLATFORM= UNDEF_PLATFORM=

View File

@ -80,12 +80,12 @@ DEV_FLAGS= -g -z \
endif endif
# link options for HP-UX linker, /usr/bin/ld # link options for HP-UX linker, /usr/bin/ld
LINK_OPTS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -AA +e -Wl,+concatrpath EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -AA +e -Wl,+concatrpath
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -b +e -Wl,+concatrpath LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -b +e -Wl,+concatrpath
# From original HPUX prefix file # From original HPUX prefix file
LIB_LINK_RPATH= -Wl,+b,$(1) LIB_LINK_RPATH= -Wl,+b,$(1)
LIB_LINK_SONAME= -Wl,+h,$(1) LIB_LINK_SONAME= -Wl,+h,$(1)
LIB_LINK_MAPFILE= -Wl,-c, LIB_LINK_MAPFILE= -Wl,-c,$(1)
UNDEF_PLATFORM= UNDEF_PLATFORM=

View File

@ -25,7 +25,7 @@ DEV_FLAGS= -ggdb -pipe -fPIC -MMD -DHP11 -DHPUX -D_HPUX_SOURCE -D_XOPEN_SOURCE_E
LIB_LINK_OPTIONS= -fPIC -shared LIB_LINK_OPTIONS= -fPIC -shared
LIB_LINK_RPATH= -Wl,+b,$(1) LIB_LINK_RPATH= -Wl,+b,$(1)
LIB_LINK_SONAME= -Wl,+h,$(1) LIB_LINK_SONAME= -Wl,+h,$(1)
LIB_LINK_MAPFILE= -Wl,-c, LIB_LINK_MAPFILE= -Wl,-c,$(1)
UNDEF_PLATFORM= UNDEF_PLATFORM=

View File

@ -32,7 +32,7 @@ LIB_LINK_OPTIONS+=-Wl,--enable-stdcall-fixup
# Strip symbols from release versions to decrease size # Strip symbols from release versions to decrease size
ifeq ($(IsProdTypeBuild),Y) ifeq ($(IsProdTypeBuild),Y)
LINK_OPTS+=-Wl,-s EXE_LINK_OPTIONS+=-Wl,-s
LIB_LINK_OPTIONS+=-Wl,-s LIB_LINK_OPTIONS+=-Wl,-s
endif endif

View File

@ -18,7 +18,7 @@
# #
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
LINK_OPTS=-Wl,--rpath -Wl,@prefix@/lib EXE_LINK_OPTIONS=-Wl,--rpath -Wl,@prefix@/lib
PROD_FLAGS=-O -fno-builtin -pipe -MMD -fPIC PROD_FLAGS=-O -fno-builtin -pipe -MMD -fPIC
DEV_FLAGS=-g -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-non-virtual-dtor DEV_FLAGS=-g -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-non-virtual-dtor

View File

@ -87,10 +87,10 @@ DEV_FLAGS= -g -xs \
LIB_PLATFORM_RPATH= -R $(1) LIB_PLATFORM_RPATH= -R $(1)
LIB_LINK_SONAME= -h $(1) LIB_LINK_SONAME= -h $(1)
LIB_LINK_MAPFILE= -M LIB_LINK_MAPFILE= -M $(1)
# link options for Solaris linker, /usr/ccs/bin/ld # link options for Solaris linker, /usr/ccs/bin/ld
LINK_OPTS+= -library=no%Cstd,Crun EXE_LINK_OPTIONS+= -library=no%Cstd,Crun
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -G -library=no%Cstd,Crun LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -G -library=no%Cstd,Crun
UNDEF_PLATFORM= UNDEF_PLATFORM=

View File

@ -60,7 +60,7 @@ LIB_LINK_OPTIONS= -G
LIB_PLATFORM_RPATH=-R $(1) LIB_PLATFORM_RPATH=-R $(1)
LIB_LINK_SONAME=-h $(1) LIB_LINK_SONAME=-h $(1)
LIB_LINK_MAPFILE= -Xlinker -M LIB_LINK_MAPFILE= -Xlinker -M$(1)
LD=g++ LD=g++
LDFLAGS=-m64 LDFLAGS=-m64

View File

@ -43,6 +43,6 @@ endif
LIB_LINK_OPTIONS= -G LIB_LINK_OPTIONS= -G
LIB_PLATFORM_RPATH= -R $(1) LIB_PLATFORM_RPATH= -R $(1)
LIB_LINK_SONAME= -h $(1) LIB_LINK_SONAME= -h $(1)
LIB_LINK_MAPFILE= -Xlinker -M LIB_LINK_MAPFILE= -Xlinker -M$(1)
UNDEF_PLATFORM = -Wl,-z,defs UNDEF_PLATFORM = -Wl,-z,defs

View File

@ -50,11 +50,11 @@ STATICLINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
SO_LINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio SO_LINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
endif endif
LINK_OPTS+=-m64 EXE_LINK_OPTIONS+=-m64
LIB_LINK+=-m64 LIB_LINK+=-m64
LIB_LINK_OPTIONS= -m64 -fPIC -shared LIB_LINK_OPTIONS= -m64 -fPIC -shared
LIB_PLATFORM_RPATH= -R $(1) LIB_PLATFORM_RPATH= -R $(1)
LIB_LINK_SONAME= -h $(1) LIB_LINK_SONAME= -h $(1)
LIB_LINK_MAPFILE= -Xlinker -M LIB_LINK_MAPFILE= -Xlinker -M$(1)
UNDEF_PLATFORM = -Wl,-z,defs UNDEF_PLATFORM = -Wl,-z,defs