Commit 16f60fcb by Tristan Gingold Committed by Tristan Gingold

re PR bootstrap/44001 (.o vs. obj => @OBJEXT@ and $ac_objext)

2010-09-08  Tristan Gingold  <gingold@adacore.com>

	PR 44001
	* maint-tool (missing): Fix pattern for object file.
	(deps): Use $(objext) for object extension.
	* Makefile.in (objext): New variable.
	Replace all occurences of .o with .$(objext)
	Regenerate with maint-deps
	* configure.ac (pexecute): Set to the basename.
	* configure: Regenerate.

From-SVN: r163989
parent 7370e0da
2010-09-08 Tristan Gingold <gingold@adacore.com>
PR 44001
* maint-tool (missing): Fix pattern for object file.
(deps): Use $(objext) for object extension.
* Makefile.in (objext): New variable.
Replace all occurences of .o with .$(objext)
Regenerate with maint-deps
* configure.ac (pexecute): Set to the basename.
* configure: Regenerate.
2010-08-20 Maciej W. Rozycki <macro@codesourcery.com>
* pex-common.c (pex_read_err): Set stderr_pipe to -1 if a
......
......@@ -6539,10 +6539,10 @@ fi
# Figure out which version of pexecute to use.
case "${host}" in
*-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;;
*-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;;
*-*-msdos*) pexecute=./pex-msdos.o ;;
*) pexecute=./pex-unix.o ;;
*-*-mingw* | *-*-winnt*) pexecute=pex-win32 ;;
*-*-msdosdjgpp*) pexecute=pex-djgpp ;;
*-*-msdos*) pexecute=pex-msdos ;;
*) pexecute=pex-unix ;;
esac
......
......@@ -671,10 +671,10 @@ fi
# Figure out which version of pexecute to use.
case "${host}" in
*-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;;
*-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;;
*-*-msdos*) pexecute=./pex-msdos.o ;;
*) pexecute=./pex-unix.o ;;
*-*-mingw* | *-*-winnt*) pexecute=pex-win32 ;;
*-*-msdosdjgpp*) pexecute=pex-djgpp ;;
*-*-msdos*) pexecute=pex-msdos ;;
*) pexecute=pex-unix ;;
esac
AC_SUBST(pexecute)
......
......@@ -76,7 +76,7 @@ sub missing {
for $f (sort keys %listed) {
if ($f =~ /(.*)\.c$/) {
$base = $1;
if (! $listed{"$base.o"}) {
if (! $listed{"./$base.o"}) {
print "O $f\n";
}
}
......@@ -264,7 +264,7 @@ sub deps {
}
@deps = sort { &locals_first($a,$b) } keys %scanned;
$obj = $f;
$obj =~ s/\.c$/.o/;
$obj =~ s/\.c$/.\$(objext)/;
$obj = "./$obj:";
if ($#deps >= 0) {
print OUT "$obj \$(srcdir)/$f";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment