gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

darwin link changes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15419 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2002-12-31 04:16:16 +00:00
parent 59dfbd9066
commit 307a9b3f17
4 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-12-30 Adam Fedor <fedor@gnu.org>
* ld_lib_path.sh: Use DYLD_LIBRARY_PATH on darwin
* ld_lib_path.csh: Idem.
* target.make (darwin): Don't set DYLIB_COMPATIBILITY_VERSION,
set DYLIB_CURRENT_VERSION correctly, link to LIB_LINK_INSTALL_NAME.
Mon Dec 30 16:38:16 2002 Nicola Pero <n.pero@mi.flashnet.it>
A new library-combo apple-apple-apple has been added, and made the

17
ld_lib_path.csh
View file

@ -58,6 +58,23 @@ switch ( "${host_os}" )
endif
breaksw
case *darwin* :
if ( $?DYLD_LIBRARY_PATH == 0 ) then
setenv DYLD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
else
setenv DYLD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${DYLD_LIBRARY_PATH}"
endif
if ( $?additional_lib_paths == 1) then
foreach dir (${additional_lib_paths})
set additional="${additional}${dir}:"
end
endif
if ( "${?additional}" == "1" ) then
setenv DYLD_LIBRARY_PATH="${additional}${DYLD_LIBRARY_PATH}"
endif
breaksw
case *hpux* :
if ( $?SHLIB_PATH == 0 ) then
setenv SHLIB_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"

11
ld_lib_path.sh
View file

@ -94,6 +94,17 @@ case "$host_os" in
export DYLD_LIBRARY_PATH
;;
*darwin*)
if [ -z "$DYLD_LIBRARY_PATH" ]; then
DYLD_LIBRARY_PATH="$lib_paths"
else
if ( echo ${DYLD_LIBRARY_PATH}|fgrep -v "${lib_paths}" >/dev/null ); then
DYLD_LIBRARY_PATH="$lib_paths:$DYLD_LIBRARY_PATH"
fi
fi
export DYLD_LIBRARY_PATH
;;
*hpux*)
if [ -z "$SHLIB_PATH" ]; then
SHLIB_PATH="$lib_paths"

14
target.make
View file

@ -286,8 +286,9 @@ ifeq ($(FOUNDATION_LIB), apple)
endif
endif
DYLIB_COMPATIBILITY_VERSION = -compatibility_version 1
DYLIB_CURRENT_VERSION = -current_version 1
# The developer should set this explicitly
#DYLIB_COMPATIBILITY_VERSION = -compatibility_version $(VERSION)
DYLIB_CURRENT_VERSION = -current_version $(VERSION)
# Remove empty dirs from the compiler/linker flags (ie, remove -Idir and
# -Ldir flags where dir is empty).
@ -313,6 +314,8 @@ SHARED_LIB_LINK_CMD = \
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
$^ $(SHARED_LD_POSTFLAGS); \
(cd $(LIB_LINK_OBJ_DIR); rm -f $(LIB_LINK_FILE); \
rm -f $(LIB_LINK_INSTALL_NAME); \
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_INSTALL_NAME); \
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
HAVE_BUNDLES = no
@ -336,6 +339,8 @@ SHARED_LIB_LINK_CMD = \
$(INTERNAL_LIBRARIES_DEPEND_UPON) $(LIBRARIES_FOUNDATION_DEPEND_UPON) \
$^ $(SHARED_LD_POSTFLAGS); \
(cd $(LIB_LINK_OBJ_DIR); rm -f $(LIB_LINK_FILE); \
rm -f $(LIB_LINK_INSTALL_NAME); \
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_INSTALL_NAME); \
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
SHARED_CFLAGS += -dynamic
@ -345,6 +350,11 @@ BUNDLE_LDFLAGS += -bundle -undefined error $(ARCH_FLAGS)
endif # OBJC_COMPILER
AFTER_INSTALL_SHARED_LIB_CMD = \
(cd $(LIB_LINK_INSTALL_DIR); \
rm -f $(LIB_LINK_INSTALL_NAME); \
$(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_INSTALL_NAME))
OBJ_MERGE_CMD = \
$(CC) -nostdlib -r -d -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;