mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-06 03:40:44 +00:00
Don't assume . in path.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@3189 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
9170d91cd1
commit
67d410cdd6
4 changed files with 17 additions and 12 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Mon Nov 9 16:34:20 1998 Adam Fedor <fedor@doc.com>
|
||||||
|
|
||||||
|
* configure.in: Don't assume . in path (Fix from Christopher
|
||||||
|
Seawood <cls@seawood.org>).
|
||||||
|
|
||||||
Fri Nov 6 13:15:00 1998 Richard Frith-Macdonald <richard@brainstrom.co.uk>
|
Fri Nov 6 13:15:00 1998 Richard Frith-Macdonald <richard@brainstrom.co.uk>
|
||||||
|
|
||||||
* target.make: If objc library built with threads, assume we need to
|
* target.make: If objc library built with threads, assume we need to
|
||||||
|
|
8
configure
vendored
8
configure
vendored
|
@ -1455,8 +1455,8 @@ done
|
||||||
# Find for DPS
|
# Find for DPS
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
if test -f clean_cpu.sh; then
|
if test -f clean_cpu.sh; then
|
||||||
transformed_host_cpu=`clean_cpu.sh $host_cpu`
|
transformed_host_cpu=`./clean_cpu.sh $host_cpu`
|
||||||
transformed_target_cpu=`clean_cpu.sh $target_cpu`
|
transformed_target_cpu=`./clean_cpu.sh $target_cpu`
|
||||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
||||||
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
||||||
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
||||||
|
@ -1464,8 +1464,8 @@ fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -f clean_os.sh; then
|
if test -f clean_os.sh; then
|
||||||
transformed_host_os=`clean_os.sh $host_os`
|
transformed_host_os=`./clean_os.sh $host_os`
|
||||||
transformed_target_os=`clean_os.sh $target_os`
|
transformed_target_os=`./clean_os.sh $target_os`
|
||||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
||||||
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
||||||
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
||||||
|
|
|
@ -86,8 +86,8 @@ AC_HAVE_HEADERS(sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h dnl
|
||||||
# Find for DPS
|
# Find for DPS
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
if test -f clean_cpu.sh; then
|
if test -f clean_cpu.sh; then
|
||||||
transformed_host_cpu=`clean_cpu.sh $host_cpu`
|
transformed_host_cpu=`./clean_cpu.sh $host_cpu`
|
||||||
transformed_target_cpu=`clean_cpu.sh $target_cpu`
|
transformed_target_cpu=`./clean_cpu.sh $target_cpu`
|
||||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
||||||
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
||||||
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
||||||
|
@ -95,8 +95,8 @@ fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -f clean_os.sh; then
|
if test -f clean_os.sh; then
|
||||||
transformed_host_os=`clean_os.sh $host_os`
|
transformed_host_os=`./clean_os.sh $host_os`
|
||||||
transformed_target_os=`clean_os.sh $target_os`
|
transformed_target_os=`./clean_os.sh $target_os`
|
||||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
||||||
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
||||||
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
||||||
|
|
|
@ -264,20 +264,20 @@ ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
|
||||||
HAVE_SHARED_LIBS = yes
|
HAVE_SHARED_LIBS = yes
|
||||||
SHARED_LD = ld
|
SHARED_LD = ld
|
||||||
SHARED_LIB_LINK_CMD = \
|
SHARED_LIB_LINK_CMD = \
|
||||||
$(SHARED_LD) -x -Bshareable -Bforcearchive \
|
$(SHARED_LD) -r -x -Bshareable -Bforcearchive \
|
||||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
|
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
|
||||||
(cd $(GNUSTEP_OBJ_DIR); \
|
(cd $(GNUSTEP_OBJ_DIR); \
|
||||||
rm -f $(LIBRARY_FILE); \
|
rm -f $(LIBRARY_FILE); \
|
||||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||||
|
|
||||||
SHARED_CFLAGS += -fPIC
|
SHARED_CFLAGS += -fpic -fPIC -shared
|
||||||
SHARED_LIBEXT = .so
|
SHARED_LIBEXT = .so
|
||||||
|
|
||||||
HAVE_BUNDLES = yes
|
HAVE_BUNDLES = yes
|
||||||
BUNDLE_LD = gcc
|
BUNDLE_LD = gcc
|
||||||
BUNDLE_CFLAGS += -fPIC
|
#BUNDLE_CFLAGS += -fPIC
|
||||||
BUNDLE_LDFLAGS += -shared
|
BUNDLE_LDFLAGS += -shared
|
||||||
ADDITIONAL_LDFLAGS += -rdynamic
|
#ADDITIONAL_LDFLAGS += -rdynamic
|
||||||
endif
|
endif
|
||||||
#
|
#
|
||||||
# end NetBSD
|
# end NetBSD
|
||||||
|
|
Loading…
Reference in a new issue