procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the NASM environment variable to NASMOPT.

Browse source
This commit is contained in:
H. Peter Anvin 2002-05-04 04:11:00 +00:00
parent 00edfad9cb
commit 53ea605b4d
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,3 +1,6 @@
2002-05-03 H. Peter Anvin <hpa@zytor.com>
* (nasm.c): Change the NASM environment variable to NASMOPT.
2002-05-03 H. Peter Anvin <hpa@zytor.com>
* (Makefile.in Mkfiles/*): use new version -> version.{h,mac}.
* (macros.pl): support multiple input files (standard.mac, version.mac).

17
doc/nasmdoc.src
View file

@ -561,7 +561,7 @@ to search for the file \c{foobar.i}...)
If you want to define a \e{standard} \i{include search path},
similar to \c{/usr/include} on Unix systems, you should place one or
more \c{-i} directives in the \c{NASM} environment variable (see
more \c{-i} directives in the \c{NASMOPT} environment variable (see
\k{nasmenv}).
For Makefile compatibility with many C compilers, this option can also
@ -762,13 +762,13 @@ and the date on which it was compiled.
You will need the version number if you report a bug.
\S{nasmenv} The \c{NASM} \i{Environment} Variable
\S{nasmenv} The \c{NASMOPT} \i{Environment} Variable
If you define an environment variable called \c{NASM}, the program
If you define an environment variable called \c{NASMOPT}, the program
will interpret it as a list of extra command-line options, which are
processed before the real command line. You can use this to define
standard search directories for include files, by putting \c{-i}
options in the \c{NASM} variable.
options in the \c{NASMOPT} variable.
The value of the variable is split up at white space, so that the
value \c{-s -ic:\\nasmlib} will be treated as two separate options.
@ -778,12 +778,15 @@ NASM command-line processing will get confused by the two
nonsensical words \c{-dNAME="my} and \c{name"}.
To get round this, NASM provides a feature whereby, if you begin the
\c{NASM} environment variable with some character that isn't a minus
\c{NASMOPT} environment variable with some character that isn't a minus
sign, then NASM will treat this character as the \i{separator
character} for options. So setting the \c{NASM} variable to the
character} for options. So setting the \c{NASMOPT} variable to the
value \c{!-s!-ic:\\nasmlib} is equivalent to setting it to \c{-s
-ic:\\nasmlib}, but \c{!-dNAME="my name"} will work.
This variable was called \c{NASM} in earlier versions of NASM,
however, this caused problems with makefiles which used a \c{$(NASM)}
variable.
\H{qstart} \i{Quick Start} for \i{MASM} Users
@ -5655,7 +5658,7 @@ it.
\b Which version of NASM you're using, and exactly how you invoked
it. Give us the precise command line, and the contents of the
\c{NASM} environment variable if any.
\c{NASMOPT} environment variable if any.
\b Which versions of any supplementary programs you're using, and
how you invoked them. If the problem only becomes visible at link

4
nasm.c
View file

@ -683,9 +683,9 @@ static void parse_cmdline(int argc, char **argv)
*inname = *outname = *listname = '\0';
/*
* First, process the NASM environment variable.
* First, process the NASMOPT environment variable.
*/
envreal = getenv("NASM");
envreal = getenv("NASMOPT");
arg = NULL;
if (envreal) {
envcopy = nasm_strdup(envreal);