mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-02-05 06:04:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

When .POSIX: is specified use POSIX-standard macro values by default.

Browse source
This commit is contained in:
Paul Smith 2012-09-09 19:19:15 +00:00
parent 7f5309ebb4
commit 30b2e4207d
4 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-09 Paul Smith <psmith@gnu.org>
* read.c (record_files): Reset the default macro values if .POSIX
is set. Fixes Savannah bug #37069.
2012-09-01 Eli Zaretskii <eliz@gnu.org> 2012-09-01 Eli Zaretskii <eliz@gnu.org>
* README.W32.template: Update for job-server and Guile support. * README.W32.template: Update for job-server and Guile support.

7
read.c
View file

@ -1962,6 +1962,13 @@ record_files (struct nameseq *filenames, const char *pattern,
{ {
posix_pedantic = 1; posix_pedantic = 1;
define_variable_cname (".SHELLFLAGS", "-ec", o_default, 0); define_variable_cname (".SHELLFLAGS", "-ec", o_default, 0);
/* These default values are based on IEEE Std 1003.1-2008. */
define_variable_cname ("ARFLAGS", "-rv", o_default, 0);
define_variable_cname ("CC", "c99", o_default, 0);
define_variable_cname ("CFLAGS", "-O", o_default, 0);
define_variable_cname ("FC", "fort77", o_default, 0);
define_variable_cname ("FFLAGS", "-O 1", o_default, 0);
define_variable_cname ("SCCSGETFLAGS", "-s", o_default, 0);
} }
else if (streq (name, ".SECONDEXPANSION")) else if (streq (name, ".SECONDEXPANSION"))
second_expansion = 1; second_expansion = 1;

5
tests/ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-09 Paul Smith <psmith@gnu.org>
* scripts/targets/POSIX: Add tests for default macro values as
specified by IEEE Std 1003.1-2008. See Savannah bug #37069.
2012-03-04 Paul Smith <psmith@gnu.org> 2012-03-04 Paul Smith <psmith@gnu.org>
* scripts/features/se_explicit: Test $(x:%=%) format in secondary * scripts/features/se_explicit: Test $(x:%=%) format in secondary

25
tests/scripts/targets/POSIX
View file

@ -1,6 +1,6 @@
# -*-perl-*- # -*-perl-*-
$description = "Test the behaviour of the .PHONY target."; $description = "Test the behaviour of the .POSIX target.";
$details = ""; $details = "";
@ -30,5 +30,28 @@ all: ; \@$script
!, !,
'', $out); '', $out);
# Test the default value of various POSIX-specific variables
my %POSIX = (AR => 'ar', ARFLAGS => '-rv',
YACC => 'yacc', YFLAGS => '',
LEX => 'lex', LFLAGS => '',
LDFLAGS => '',
CC => 'c99', CFLAGS => '-O',
FC => 'fort77', FFLAGS => '-O 1',
GET => 'get', GFLAGS => '',
SCCSFLAGS => '', SCCSGETFLAGS => '-s');
my $make = join('', map { "\t\@echo '$_=\$($_)'\n" } sort keys %POSIX);
my $r = join('', map { "$_=$POSIX{$_}\n"} sort keys %POSIX);
run_make_test(qq!
.POSIX:
all:
$make
!,
'', $r);
# Make sure that local settings take precedence
%extraENV = map { $_ => "xx-$_" } keys %POSIX;
$r = join('', map { "$_=xx-$_\n"} sort keys %POSIX);
run_make_test(undef, '', $r);
# This tells the test driver that the perl test script executed properly. # This tells the test driver that the perl test script executed properly.
1; 1;