* configure.in: Build itl, db, sn, etc., when building for native
cygwin32. * Makefile.in (LD): New variable. (EXTRA_HOST_FLAGS): Pass down LD. ($(DO_X)): Likewise. Mon Jun 16 11:10:35 1997 Philip Blundell <Philip.Blundell@pobox.com> * Makefile.in (INSTALL): Use $(SHELL) when executing install-sh.
This commit is contained in:
Ian Lance Taylor
parent
45c795f7c0
commit
6443441854
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
Mon Jun 16 11:11:10 1997 Ian Lance Taylor <ian@cygnus.com>
|
||||
|
||||
* configure.in: Build itl, db, sn, etc., when building for native
|
||||
cygwin32.
|
||||
|
||||
* Makefile.in (LD): New variable.
|
||||
(EXTRA_HOST_FLAGS): Pass down LD.
|
||||
($(DO_X)): Likewise.
|
||||
|
||||
Mon Jun 16 11:10:35 1997 Philip Blundell <Philip.Blundell@pobox.com>
|
||||
|
||||
* Makefile.in (INSTALL): Use $(SHELL) when executing install-sh.
|
||||
|
||||
Fri Jun 13 10:22:56 1997 Bob Manson <manson@charmed.cygnus.com>
|
||||
|
||||
* configure.in (targargs): Strip out any supplied --build argument
|
||||
|
|
|
|||
16
Makefile.in
16
Makefile.in
|
|
@ -45,7 +45,7 @@ GDB_NLM_DEPS =
|
|||
|
||||
SHELL = /bin/sh
|
||||
|
||||
INSTALL = $$s/install-sh -c
|
||||
INSTALL = $(SHELL) $$s/install-sh -c
|
||||
INSTALL_PROGRAM = $(INSTALL)
|
||||
INSTALL_DATA = $(INSTALL) -m 644
|
||||
|
||||
|
|
@ -89,6 +89,9 @@ RANLIB = ranlib
|
|||
DLLTOOL = dlltool
|
||||
|
||||
NM = nm
|
||||
|
||||
LD = ld
|
||||
|
||||
# Not plain GZIP, since gzip looks there for extra command-line options.
|
||||
GZIPPROG = gzip
|
||||
|
||||
|
|
@ -352,6 +355,7 @@ EXTRA_HOST_FLAGS = \
|
|||
'CC=$(CC)' \
|
||||
'CXX=$(CXX)' \
|
||||
'DLLTOOL=$(DLLTOOL)' \
|
||||
'LD=$(LD)' \
|
||||
'NM=$(NM)' \
|
||||
'RANLIB=$(RANLIB)'
|
||||
|
||||
|
|
@ -852,10 +856,10 @@ $(DO_X):
|
|||
done; \
|
||||
;; \
|
||||
esac ; \
|
||||
export AR AS CC CXX NM RANLIB DLLTOOL; \
|
||||
export AR AS CC CXX LD NM RANLIB DLLTOOL; \
|
||||
if (cd ./$$i; \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" \
|
||||
$${target}); \
|
||||
|
|
@ -871,10 +875,10 @@ $(DO_X):
|
|||
for flag in $(EXTRA_TARGET_FLAGS); do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
|
||||
done; \
|
||||
export AR AS CC CXX NM RANLIB DLLTOOL; \
|
||||
export AR AS CC CXX LD NM RANLIB DLLTOOL; \
|
||||
if (cd $(TARGET_SUBDIR)/$$i; \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" \
|
||||
$${target}); \
|
||||
|
|
@ -1505,7 +1509,7 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
|
|||
# Take out texinfo from a few places; make simple BISON=bison line.
|
||||
sed -e '/^all\.normal: /s/\all-texinfo //' \
|
||||
-e '/^ install-texinfo /d' \
|
||||
-e '/^BISON = /,/^$$/d' \
|
||||
-e '/^BISON = `if/,/^$$/d' \
|
||||
-e '/^# BISON:/s/.*/BISON = bison -y/' \
|
||||
<Makefile.in >tmp
|
||||
mv -f tmp Makefile.in
|
||||
|
|
|
|||
23
configure.in
23
configure.in
|
|
@ -391,10 +391,7 @@ case "${host}" in
|
|||
# end-sanitize-ide
|
||||
;;
|
||||
*-*-cygwin32)
|
||||
noconfigdirs="expect dejagnu cvs autoconf automake bison send-pr gprof rcs guile perl texinfo apache inet itcl db sn gnuserv"
|
||||
# start-sanitize-ide
|
||||
noconfigdirs="$noconfigdirs libide vmake"
|
||||
# end-sanitize-ide
|
||||
noconfigdirs="expect dejagnu cvs autoconf automake bison send-pr gprof rcs guile perl texinfo apache inet"
|
||||
;;
|
||||
*-*-windows*)
|
||||
# This is only used to build WinGDB...
|
||||
|
|
@ -480,17 +477,18 @@ case "${target}" in
|
|||
;;
|
||||
*-*-cygwin32)
|
||||
target_configdirs="$target_configdirs target-winsup"
|
||||
noconfigdirs="$noconfigdirs expect target-libgloss itcl db sn gnuserv"
|
||||
# start-sanitize-ide
|
||||
noconfigdirs="$noconfigdirs libide vmake"
|
||||
# end-sanitize-ide
|
||||
noconfigdirs="$noconfigdirs expect target-libgloss"
|
||||
# always build newlib.
|
||||
skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
|
||||
|
||||
# Can't build gdb for cygwin32 if not native.
|
||||
case "${host}" in
|
||||
*-*-cygwin32) ;; # keep gdb tcl tk expect
|
||||
*) noconfigdirs="$noconfigdirs gdb tcl tk expect"
|
||||
*-*-cygwin32) ;; # keep gdb tcl tk expect etc.
|
||||
*) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl db sn gnuserv"
|
||||
# start-sanitize-ide
|
||||
noconfigdirs="$noconfigdirs libide vmake"
|
||||
# end-sanitize-ide
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
i[3456]86-*-pe)
|
||||
|
|
@ -642,10 +640,7 @@ esac
|
|||
# If we are building a Canadian Cross, discard tools that can not be built
|
||||
# using a cross compiler. FIXME: These tools should be fixed.
|
||||
if [ "${build}" != "${host}" ]; then
|
||||
noconfigdirs="$noconfigdirs expect dejagnu itcl db sn gnuserv"
|
||||
# start-sanitize-ide
|
||||
noconfigdirs="$noconfigdirs libide ilu vmake"
|
||||
# end-sanitize-ide
|
||||
noconfigdirs="$noconfigdirs expect dejagnu"
|
||||
fi
|
||||
|
||||
# Make sure we don't let GNU ld be added if we didn't want it.
|
||||
|
|
|
|||
Loading…
Reference in New Issue