Minor cleanups

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17547 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
DJ Lucas 2016-07-03 04:10:38 +00:00
parent 6c4bb8f858
commit 5246cffcc4
2 changed files with 10 additions and 14 deletions

View File

@ -339,11 +339,6 @@ unset CFLAGS_HOLD CXXFLAGS_HOLD</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>sed ...</command>: These commands correct the source to be
compatible with gcc6 by preventing c++ scope errors.
</para>
<para>
<command>CFLAGS= ... CXXFLAGS= ...</command>: These settings work around
code which gcc6 would otherwise regard as out-of-specification and allow

View File

@ -252,16 +252,16 @@ test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozcon
<screen><userinput>sed -e '/#include/i\
print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
-i mozilla/nsprpub/config/make-system-wrappers.pl
-i mozilla/nsprpub/config/make-system-wrappers.pl &amp;&amp;
sed -e '/#include/a\
print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
-i mozilla/nsprpub/config/make-system-wrappers.pl
-i mozilla/nsprpub/config/make-system-wrappers.pl &amp;&amp;
export CFLAGS_HOLD=$CFLAGS
export CXXFLAGS_HOLD=$CXXFLAGS
export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
export CFLAGS_HOLD=$CFLAGS &amp;&amp;
export CXXFLAGS_HOLD=$CXXFLAGS &amp;&amp;
export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" &amp;&amp;
export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" &amp;&amp;
make -f client.mk</userinput></screen>
@ -275,9 +275,10 @@ make -f client.mk</userinput></screen>
</para>
<screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
chown -R 0:0 /usr/lib/thunderbird-&thunderbird-version;
export CFLAGS=$CFLAGS_HOLD
export CXXFLAGS=$CFLAGS_HOLD
chown -R 0:0 /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
export CFLAGS=$CFLAGS_HOLD &amp;&amp;
export CXXFLAGS=$CFLAGS_HOLD &amp;&amp;
unset CFLAGS_HOLD CXXFLAGS_HOLD</userinput></screen>
<!-- thunderbuild directory does not exist anymore. Leaving as comment,