aboutsummaryrefslogtreecommitdiffstats
path: root/prologue
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2013-04-28 21:11:44 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2013-04-28 21:11:44 +0000
commit5042021869a2b8207d224f553ce4bd03c71e0506 (patch)
tree0bf4755a88175822c4546f72c22c5ff7f385f0e8 /prologue
parent1026c1ee3143b0f0804b6456c70cc0841a99db36 (diff)
Sync with latest trunk updates
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10255 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'prologue')
-rw-r--r--prologue/hostreqs.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 74cb9e573..c56a91f06 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -61,9 +61,9 @@
</listitem>
<listitem>
- <para><emphasis role="strong">Gcc-4.1.2</emphasis> (Versions
- greater than &gcc-version; are not recommended as they have not
- been tested)</para>
+ <para><emphasis role="strong">GCC-4.1.2</emphasis> including the C++
+ compiler, <command>g++</command> (Versions greater than &gcc-version; are
+ not recommended as they have not been tested)</para>
</listitem>
<listitem>
@@ -170,6 +170,7 @@ if [ -e /usr/bin/awk ];
else echo "awk not found"; fi
gcc --version | head -n1
+g++ --version | head -n1
ldd --version | head -n1 | cut -d" " -f2- # glibc version
grep --version | head -n1
gzip --version | head -n1
@@ -183,10 +184,10 @@ tar --version | head -n1
echo "Texinfo: `makeinfo --version | head -n1`"
xz --version | head -n1
-echo 'main(){}' &gt; dummy.c &amp;&amp; gcc -o dummy dummy.c
+echo 'main(){}' &gt; dummy.c &amp;&amp; g++ -o dummy dummy.c
if [ -x dummy ]
- then echo "gcc compilation OK";
- else echo "gcc compilation failed"; fi
+ then echo "g++ compilation OK";
+ else echo "g++ compilation failed"; fi
rm -f dummy.c dummy</literal>
EOF