diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-05-02 02:57:11 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-05-02 02:57:11 (GMT) |
| commit | b2496d7c252ff8f9063d9176f6076a3caa98a9ac (patch) | |
| tree | b19ef7ae7ca33926a12b20d82fd7ab92d8951c0d | |
| parent | 9815157ee37a26f2ef5cc5fdd424eb839b3a6844 (diff) | |
| parent | 457ad25abc876bb8441c54877ab313b5a4d5380e (diff) | |
| download | SCons-b2496d7c252ff8f9063d9176f6076a3caa98a9ac.zip SCons-b2496d7c252ff8f9063d9176f6076a3caa98a9ac.tar.gz SCons-b2496d7c252ff8f9063d9176f6076a3caa98a9ac.tar.bz2 | |
Merge branch 'master' of github.com:SCons/scons
| -rwxr-xr-x | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ar.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index df52a7d..fcd9378 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -122,7 +122,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER (used to call telemetry script). - Docbook builder provides a fallback if lxml fails to generate a document with tostring(). - + - Fix description of ARCOMSTR constr. var. (issue 3636) diff --git a/src/engine/SCons/Tool/ar.xml b/src/engine/SCons/Tool/ar.xml index 6731397..928a6fc 100644 --- a/src/engine/SCons/Tool/ar.xml +++ b/src/engine/SCons/Tool/ar.xml @@ -62,8 +62,8 @@ The command line used to generate a static library from object files. <cvar name="ARCOMSTR"> <summary> <para> -The string displayed when an object file -is generated from an assembly-language source file. +The string displayed when a static library is +generated from object files. If this is not set, then &cv-link-ARCOM; (the command line) is displayed. </para> |