Skip to content

Commit

Permalink
Merge pull request #9607 from nckx/update-doc
Browse files Browse the repository at this point in the history
doc: specify that *Flags are string lists
  • Loading branch information
domenkozar authored Aug 31, 2016
2 parents 5b61d97 + 9413ad3 commit 7b3a361
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions doc/stdenv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -557,8 +557,8 @@ script) if it exists.</para>

<varlistentry>
<term><varname>configureFlags</varname></term>
<listitem><para>Additional arguments passed to the configure
script.</para></listitem>
<listitem><para>A list of strings passed as additional arguments to the
configure script.</para></listitem>
</varlistentry>

<varlistentry>
Expand Down Expand Up @@ -658,7 +658,7 @@ nothing.</para>

<varlistentry>
<term><varname>makeFlags</varname></term>
<listitem><para>Additional flags passed to
<listitem><para>A list of strings passed as additional flags to
<command>make</command>. These flags are also used by the default
install and check phase. For setting make flags specific to the
build phase, use <varname>buildFlags</varname> (see
Expand All @@ -685,7 +685,7 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")

<varlistentry>
<term><varname>buildFlags</varname> / <varname>buildFlagsArray</varname></term>
<listitem><para>Additional flags passed to
<listitem><para>A list of strings passed as additional flags to
<command>make</command>. Like <varname>makeFlags</varname> and
<varname>makeFlagsArray</varname>, but only used by the build
phase.</para></listitem>
Expand Down Expand Up @@ -753,7 +753,7 @@ doCheck = true;</programlisting>

<varlistentry>
<term><varname>checkFlags</varname> / <varname>checkFlagsArray</varname></term>
<listitem><para>Additional flags passed to
<listitem><para>A list of strings passed as additional flags to
<command>make</command>. Like <varname>makeFlags</varname> and
<varname>makeFlagsArray</varname>, but only used by the check
phase.</para></listitem>
Expand Down Expand Up @@ -808,7 +808,7 @@ installTargets = "install-bin install-doc";</programlisting>

<varlistentry>
<term><varname>installFlags</varname> / <varname>installFlagsArray</varname></term>
<listitem><para>Additional flags passed to
<listitem><para>A list of strings passed as additional flags to
<command>make</command>. Like <varname>makeFlags</varname> and
<varname>makeFlagsArray</varname>, but only used by the install
phase.</para></listitem>
Expand Down

0 comments on commit 7b3a361

Please sign in to comment.