mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 06:03:02 +01:00
Backported fix for CORE-2844: Unresolved symbol references when linking fbsvcmgr and fbtracemgr
This commit is contained in:
parent
d7a89a0145
commit
569200e719
@ -90,7 +90,8 @@ GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources)
|
|||||||
|
|
||||||
FBSVCMGR_Files= fbsvcmgr.cpp
|
FBSVCMGR_Files= fbsvcmgr.cpp
|
||||||
FBSVCMGR_Other_Sources = common/classes/fb_string.cpp common/classes/alloc.cpp \
|
FBSVCMGR_Other_Sources = common/classes/fb_string.cpp common/classes/alloc.cpp \
|
||||||
common/fb_exception.cpp common/utils.cpp common/classes/locks.cpp jrd/path_utils.cpp
|
common/fb_exception.cpp common/utils.cpp common/classes/locks.cpp jrd/path_utils.cpp \
|
||||||
|
common/classes/semaphore.cpp
|
||||||
|
|
||||||
FBSVCMGR_Sources = $(addprefix utilities/, $(FBSVCMGR_Files)) $(FBSVCMGR_Other_Sources)
|
FBSVCMGR_Sources = $(addprefix utilities/, $(FBSVCMGR_Files)) $(FBSVCMGR_Other_Sources)
|
||||||
FBSVCMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBSVCMGR_Sources)))) \
|
FBSVCMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBSVCMGR_Sources)))) \
|
||||||
@ -99,12 +100,12 @@ $(FBCLASSES_MsgObjects) $(CLUMPLETS_Objects) $(FBCOMMON_ClientObjects)
|
|||||||
|
|
||||||
FBTRACEMGR_Files= fbtracemgr/traceMgrMain.cpp
|
FBTRACEMGR_Files= fbtracemgr/traceMgrMain.cpp
|
||||||
FBTRACEMGR_Other_Sources = common/classes/fb_string.cpp common/classes/alloc.cpp \
|
FBTRACEMGR_Other_Sources = common/classes/fb_string.cpp common/classes/alloc.cpp \
|
||||||
common/fb_exception.cpp common/utils.cpp common/classes/locks.cpp common/UtilSvc.cpp \
|
common/fb_exception.cpp common/utils.cpp common/classes/locks.cpp common/UtilSvc.cpp \
|
||||||
jrd/trace/TraceCmdLine.cpp jrd/path_utils.cpp
|
jrd/trace/TraceCmdLine.cpp jrd/path_utils.cpp common/classes/semaphore.cpp
|
||||||
|
|
||||||
FBTRACEMGR_Sources = $(addprefix utilities/, $(FBTRACEMGR_Files)) $(FBTRACEMGR_Other_Sources)
|
FBTRACEMGR_Sources = $(addprefix utilities/, $(FBTRACEMGR_Files)) $(FBTRACEMGR_Other_Sources)
|
||||||
FBTRACEMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBTRACEMGR_Sources)))) \
|
FBTRACEMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBTRACEMGR_Sources)))) \
|
||||||
$(FBCLASSES_MsgObjects) $(CLUMPLETS_Objects) $(FBCOMMON_ClientObjects)
|
$(FBCLASSES_MsgObjects) $(CLUMPLETS_Objects) $(FBCOMMON_ClientObjects)
|
||||||
|
|
||||||
|
|
||||||
FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp
|
FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp
|
||||||
|
Loading…
Reference in New Issue
Block a user