* target.make (netbsd): Remove static libs version of netbsd

target and make (netbsdelf) work for all netbsd versions.
* clean_os.sh: Don't clean netbsd targets. Fixes Bug #14635.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21839 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2005-10-17 20:31:39 +00:00
parent 139fdd2df4
commit e1c31a72de
3 changed files with 7 additions and 38 deletions

View file

@ -1,3 +1,9 @@
2005-10-17 Adam Fedor <fedor@gnu.org>
* target.make (netbsd): Remove static libs version of netbsd
target and make (netbsdelf) work for all netbsd versions.
* clean_os.sh: Don't clean netbsd targets. Fixes Bug #14635.
2005-10-14 Nicola Pero <n.pero@mi.flashnet.it>
* GNUstep.sh.in: Export GNUSTEP_USER_ROOT after setting it (Bug

View file

@ -31,11 +31,6 @@ case "$1" in
echo freebsd
exit 0
;;
# Remove version number for NetBSD ELF targets
netbsdelf* | netbsd1.6* | netbsd2*)
echo netbsdelf
exit 0
;;
# Remove version number for Darwin
darwin7*)
echo darwin7

View file

@ -674,41 +674,9 @@ endif
####################################################
#
# NetBSD
# NetBSD (ELF)
#
ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
# This is disabled temporarily, because I don't know exactly how
# to link shared libs. Everything seems to link correctly now but
# constructor functions in the shared lib failed to get called
# when the lib is loaded in. I don't know why. ASF.
HAVE_SHARED_LIBS = no
SHARED_LD = ld
SHARED_LIB_LINK_CMD = \
$(SHARED_LD) -x -Bshareable -Bforcearchive \
$(ALL_LDFLAGS) -o $(LIB_LINK_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) $^ /usr/lib/c++rt0.o;\
(cd $(LIB_LINK_OBJ_DIR); \
$(RM_LN_S) $(LIB_LINK_FILE); \
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
SHARED_CFLAGS += -shared -fpic
SHARED_LIBEXT = .so
HAVE_BUNDLES = yes
BUNDLE_LD = $(CC)
BUNDLE_LDFLAGS += -shared -fpic
#ADDITIONAL_LDFLAGS += -rdynamic
STATIC_LDFLAGS += -static
endif
#
# end NetBSD
#
####################################################
####################################################
#
# NetBSD ELF
#
ifeq ($(findstring netbsdelf, $(GNUSTEP_TARGET_OS)), netbsdelf)
HAVE_SHARED_LIBS = yes
SHARED_LD_POSTFLAGS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
SHARED_LIB_LINK_CMD = \