mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 14:20:50 +00:00
NetBSD elf fixes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14257 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
044ca0786e
commit
4117aab9ec
2 changed files with 13 additions and 6 deletions
|
@ -54,6 +54,8 @@ OBJC_RUNTIME_LIB=`echo $ac_cv_library_combo | awk -F- '{print $1}'`
|
|||
case "$target_os" in
|
||||
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
LIBS="$LIBS -L/usr/local/lib";;
|
||||
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
|
||||
LIBS="$LIBS -L/usr/pkg/lib";;
|
||||
esac
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
17
target.make
17
target.make
|
@ -756,17 +756,21 @@ endif
|
|||
# NetBSD ELF
|
||||
#
|
||||
ifeq ($(findstring netbsdelf, $(GNUSTEP_TARGET_OS)), netbsdelf)
|
||||
HAVE_SHARED_LIBS = yes
|
||||
HAVE_SHARED_LIBS = yes
|
||||
SHARED_LD_POSTFLAGS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
|
||||
SHARED_LIB_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) \
|
||||
$^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
SHARED_FRAMEWORK_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ ;\
|
||||
-o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
$^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
|
||||
$(SHARED_LD_POSTFLAGS); \
|
||||
(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
|
@ -782,9 +786,10 @@ HAVE_BUNDLES = yes
|
|||
BUNDLE_LD = $(CC)
|
||||
BUNDLE_CFLAGS += -fPIC
|
||||
BUNDLE_LDFLAGS += -shared
|
||||
ADDITIONAL_LDFLAGS += -rdynamic
|
||||
ADDITIONAL_LDFLAGS += -rdynamic -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
|
||||
ADDITIONAL_INCLUDE_DIRS += -I/usr/pkg/include
|
||||
ifeq ($(shared), no)
|
||||
ADDITIONAL_LDFLAGS += -static
|
||||
ADDITIONAL_LDFLAGS += -static -L/usr/pkg/lib
|
||||
endif
|
||||
endif
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue