mirror of
https://github.com/boostorg/build.git
synced 2026-02-15 13:02:11 +00:00
Minor fixes.
* jam_src/Jambase: Now really downcase $(ARGV[1]).
* jam_src/compile.c: Fix formatting, now that 'lol_print' don't insert
space at the end.
* jam_src/jambase.c: Regenerated.
[SVN r13676]
This commit is contained in:
@@ -80,7 +80,7 @@ rule record-file-location ( file : location )
|
||||
file-location.$(file:G=) = $(location) ;
|
||||
}
|
||||
|
||||
if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ]
|
||||
if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
|
||||
|| $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1
|
||||
{
|
||||
# Another temporary measure so Jam works with Boost.Build v1
|
||||
|
||||
@@ -574,9 +574,9 @@ static void argument_error( char* message, RULE* rule, FRAME* frame, LIST* arg )
|
||||
backtrace_line( frame->prev );
|
||||
printf( "*** argument error\n* rule %s ( ", frame->rulename );
|
||||
lol_print( rule->arguments->data );
|
||||
printf( ")\n* called with: ( " );
|
||||
printf( " )\n* called with: ( " );
|
||||
lol_print( actual );
|
||||
printf( ")\n* %s %s\n", message, arg ? arg->string : "" );
|
||||
printf( " )\n* %s %s\n", message, arg ? arg->string : "" );
|
||||
print_source_line( rule->procedure );
|
||||
printf( "see definition of rule '%s' being called\n", rule->name );
|
||||
backtrace( frame->prev );
|
||||
|
||||
@@ -40,7 +40,7 @@ char *jambase[] = {
|
||||
"{\n",
|
||||
"file-location.$(file:G=) = $(location) ;\n",
|
||||
"}\n",
|
||||
"if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ]\n",
|
||||
"if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]\n",
|
||||
"|| $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1\n",
|
||||
"{\n",
|
||||
"BOOST_BUILD_PATH ?= $(BOOST_ROOT)/tools/build ;\n",
|
||||
|
||||
@@ -80,7 +80,7 @@ rule record-file-location ( file : location )
|
||||
file-location.$(file:G=) = $(location) ;
|
||||
}
|
||||
|
||||
if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ]
|
||||
if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
|
||||
|| $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1
|
||||
{
|
||||
# Another temporary measure so Jam works with Boost.Build v1
|
||||
|
||||
@@ -574,9 +574,9 @@ static void argument_error( char* message, RULE* rule, FRAME* frame, LIST* arg )
|
||||
backtrace_line( frame->prev );
|
||||
printf( "*** argument error\n* rule %s ( ", frame->rulename );
|
||||
lol_print( rule->arguments->data );
|
||||
printf( ")\n* called with: ( " );
|
||||
printf( " )\n* called with: ( " );
|
||||
lol_print( actual );
|
||||
printf( ")\n* %s %s\n", message, arg ? arg->string : "" );
|
||||
printf( " )\n* %s %s\n", message, arg ? arg->string : "" );
|
||||
print_source_line( rule->procedure );
|
||||
printf( "see definition of rule '%s' being called\n", rule->name );
|
||||
backtrace( frame->prev );
|
||||
|
||||
@@ -40,7 +40,7 @@ char *jambase[] = {
|
||||
"{\n",
|
||||
"file-location.$(file:G=) = $(location) ;\n",
|
||||
"}\n",
|
||||
"if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ]\n",
|
||||
"if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]\n",
|
||||
"|| $(BOOST_ROOT) # A temporary measure so Jam works with Boost.Build v1\n",
|
||||
"{\n",
|
||||
"BOOST_BUILD_PATH ?= $(BOOST_ROOT)/tools/build ;\n",
|
||||
|
||||
Reference in New Issue
Block a user