Updated so it can now build SDDS in extensions.

This commit is contained in:
Robert Soliday
2003-08-04 15:46:23 +00:00
parent ce29455411
commit 73b8c02bae
2 changed files with 13 additions and 4 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ ARCH_CLASS = x86
POSIX_CPPFLAGS_NO =
POSIX_LDLIBS_YES = libpthread.so
OP_SYS_CPPFLAGS += -D_BSD_SOURCE
OP_SYS_CPPFLAGS += -D_BSD_SOURCE -D_SVID_SOURCE
OP_SYS_CPPFLAGS += -Dlinux
OP_SYS_LDLIBS = libc.so libm.so libdl.so librt.so
@@ -52,7 +52,7 @@ CONFORM_CFLAGS_TRAD =
# -w-8012 Comparing signed and unsigned values
# -w-8060 Possibly incorrect assignment
# -w-8071 Conversion may lose significant digits
WARN_CFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071
WARN_CFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071 -w-dup
# -w- display warnings off
WARN_CFLAGS_NO = -w-
@@ -173,9 +173,18 @@ SHRLIB_DEPLIBS= $(foreach lib,$(LIB_LIBS) $(USR_LIBS), \
$(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
$(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
PROD_SYS_DEPLIBS= $(foreach lib,$(PROD_SYS_LIBS), \
$(firstword $(wildcard \
/lib/$(LIB_PREFIX)$(lib).so \
/lib/$(LIB_PREFIX)$(lib).a \
/usr/lib/$(LIB_PREFIX)$(lib).so \
/usr/lib/$(LIB_PREFIX)$(lib).a) \
$(lib)))
PROD_LDLIBS = $(addprefix lib, $($*_LDLIBS)) \
$(notdir $(PROD_DEPLIBS)) \
$(addprefix lib, $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS))
$(notdir $(PROD_SYS_DEPLIBS)) \
$(addprefix lib, $($*_SYS_LIBS) $(USR_SYS_LIBS))
SHRLIB_LDLIBS = $(addprefix lib, $($*_LDLIBS)) \
$(notdir $(SHRLIB_DEPLIBS)) \
@@ -204,7 +213,7 @@ SHRLIBDIR_LDFLAGS = -L$(subst $(space),:,$(sort $(SHRLIB_DEPLIB_DIRS) $(BORLAND_
LDFLAGS += -c -C -Gn -x -w
LINKLIBS=rtl.a visualclx.a rtle.a libborcrtl.a libborstl.a libborunwind.a
LINK.cpp = $(WINLINK) $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS) -Tpe
LINK.cpp = $(WINLINK) $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS) -Tpe -w-dup
LINK.cpp += $(PROD_LDFLAGS) borinit.o /usr/lib/crt1.o $(PROD_LD_OBJS)
LINK.cpp += , $@ ,,$(LINKLIBS) $(PROD_LDLIBS)