mirror of
https://git.savannah.gnu.org/git/make.git
synced 2024-12-27 06:27:51 +00:00
Fix make.h preprocessor directive to work better with Windows compilers.
Fix some regression tests to (hopefully) work better on Windows.
This commit is contained in:
Paul Smith
parent
6636dc1d5c
commit
f7598efb67
7 changed files with 43 additions and 19 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,9 +1,20 @@
|
|||
2005-08-29 Paul D. Smith <psmith@gnu.org>
|
||||
|
||||
* function.c (func_error): On Windows, output from $(info ...)
|
||||
seems to come in the wrong order. Try to force it with fflush().
|
||||
|
||||
2005-08-10 Boris Kolpackov <boris@kolpackov.net>
|
||||
|
||||
* read.c (record_files): Move code that sets stem for static
|
||||
pattern rules out of the if (!two_colon) condition so it is
|
||||
also executed for two-colon rules. Fixes Savannah bug #13881.
|
||||
|
||||
2005-08-08 Paul D. Smith <psmith@gnu.org>
|
||||
|
||||
* make.h: Don't test that __STDC__ is non-0. Some compilers
|
||||
(Windows for example) set it to 0 to denote "ISO C + extensions".
|
||||
Fixes bug # 13594.
|
||||
|
||||
2005-08-07 Paul D. Smith <psmith@gnu.org>
|
||||
|
||||
* w32/pathstuff.c (getcwd_fs): Fix warning about assignment in a
|
||||
|
|
|
|||
|
|
@ -1096,6 +1096,7 @@ func_error (char *o, char **argv, const char *funcname)
|
|||
|
||||
case 'i':
|
||||
printf ("%s\n", msg);
|
||||
fflush(stdout);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
2
make.h
2
make.h
|
|
@ -42,7 +42,7 @@ char *alloca ();
|
|||
|
||||
|
||||
/* Use prototypes if available. */
|
||||
#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
|
||||
#if defined (__cplusplus) || defined (__STDC__)
|
||||
# undef PARAMS
|
||||
# define PARAMS(protos) protos
|
||||
#else /* Not C++ or ANSI C. */
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
2005-08-29 Paul D. Smith <psmith@gnu.org>
|
||||
|
||||
* scripts/functions/abspath: Add some text to the error messages
|
||||
to get a better idea of what's wrong. Make warnings instead of
|
||||
errors.
|
||||
|
||||
* scripts/features/patspecific_vars: Don't use "test", which is
|
||||
UNIX specific. Print the values and let the test script match
|
||||
them.
|
||||
|
||||
2005-08-25 Paul Smith <psmith@gnu.org>
|
||||
|
||||
* scripts/variables/SHELL: Use a /./ prefix instead of //: the
|
||||
|
|
|
|||
|
|
@ -67,8 +67,8 @@ run_make_test('
|
|||
/%: export foo := foo
|
||||
|
||||
/bar:
|
||||
@test "$(foo)" = "$$foo"
|
||||
', '', '');
|
||||
@echo $(foo) $$foo
|
||||
', '', 'foo foo');
|
||||
|
||||
|
||||
# TEST #6 -- test expansion of pattern-specific simple variables
|
||||
|
|
|
|||
|
|
@ -5,68 +5,68 @@ $details = "";
|
|||
|
||||
run_make_test('
|
||||
ifneq ($(realpath $(abspath .)),$(CURDIR))
|
||||
$(error )
|
||||
$(warning .: abs="$(abspath .)" real="$(realpath $(abspath .))" curdir="$(CURDIR)")
|
||||
endif
|
||||
|
||||
ifneq ($(realpath $(abspath ./)),$(CURDIR))
|
||||
$(error )
|
||||
$(warning ./: abs="$(abspath ./)" real="$(realpath $(abspath ./))" curdir="$(CURDIR)")
|
||||
endif
|
||||
|
||||
ifneq ($(realpath $(abspath .///)),$(CURDIR))
|
||||
$(error )
|
||||
$(warning .///: abs="$(abspath .///)" real="$(realpath $(abspath .///))" curdir="$(CURDIR)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /),/)
|
||||
$(error )
|
||||
$(warning /: abspath="$(abspath /)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath ///),/)
|
||||
$(error )
|
||||
$(warning ///: abspath="$(abspath ///)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /.),/)
|
||||
$(error )
|
||||
$(warning /.: abspath="$(abspath /.)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath ///.),/)
|
||||
$(error )
|
||||
$(warning ///.: abspath="$(abspath ///.)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /./),/)
|
||||
$(error )
|
||||
$(warning /./: abspath="$(abspath /./)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /.///),/)
|
||||
$(error )
|
||||
$(warning /.///: abspath="$(abspath /.///)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /..),/)
|
||||
$(error )
|
||||
$(warning /..: abspath="$(abspath /..)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath ///..),/)
|
||||
$(error )
|
||||
$(warning ///..: abspath="$(abspath ///..)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /../),/)
|
||||
$(error )
|
||||
$(warning /../: abspath="$(abspath /../)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /..///),/)
|
||||
$(error )
|
||||
$(warning /..///: abspath="$(abspath /..///)")
|
||||
endif
|
||||
|
||||
|
||||
ifneq ($(abspath /foo/bar/..),/foo)
|
||||
$(error )
|
||||
$(warning /foo/bar/..: abspath="$(abspath /foo/bar/..)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /foo/bar/../../../baz),/baz)
|
||||
$(error )
|
||||
$(warning /foo/bar/../../../baz: abspath="$(abspath /foo/bar/../../../baz)")
|
||||
endif
|
||||
|
||||
ifneq ($(abspath /foo/bar/../ /..),/foo /)
|
||||
$(error )
|
||||
$(warning /foo/bar/../ /..: abspath="$(abspath /foo/bar/../ /..)")
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# -*-perl-*-
|
||||
|
||||
$description ="The following test creates a makefile to test the -I option.";
|
||||
|
||||
$details = "\
|
||||
|
|
|
|||
Loading…
Reference in a new issue