aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorManuel Canales Esparcia <manuel@linuxfromscratch.org>2007-05-06 08:36:44 +0000
committerManuel Canales Esparcia <manuel@linuxfromscratch.org>2007-05-06 08:36:44 +0000
commit006ed0368e8b992a325bf9522965ccb70f67c2f3 (patch)
tree46692de13193b063d831663f8d2b5c8fb84e05bd /chapter06
parenta2ac0943e56aa72d12464d15a2227c6592953c94 (diff)
Removed nodump attributes from chapter06 readjusting and GCC sanity checks.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8119 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/gcc.xml2
-rw-r--r--chapter06/readjusting.xml14
2 files changed, 8 insertions, 8 deletions
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 288e049f8..3db1fd945 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -161,7 +161,7 @@ cd ../gcc-build</userinput></screen>
href="readjusting.xml"
xpointer="xpointer(//*[@os='g'])"/>
-<screen role="nodump"><userinput>grep -B2 '^ /usr/include' dummy.log</userinput></screen>
+<screen><userinput>grep -B2 '^ /usr/include' dummy.log</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="readjusting.xml"
diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml
index 3cbada83f..f7fce4c32 100644
--- a/chapter06/readjusting.xml
+++ b/chapter06/readjusting.xml
@@ -58,7 +58,7 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
functions (compiling and linking) of the adjusted toolchain are working
as expected. To do this, perform the following sanity checks:</para>
-<screen role="nodump" os="a"><userinput>echo 'main(){}' &gt; dummy.c
+<screen os="a"><userinput>echo 'main(){}' &gt; dummy.c
cc dummy.c -v -Wl,--verbose &amp;&gt; dummy.log
readelf -l a.out | grep ': /lib'</userinput></screen>
@@ -73,7 +73,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
<para os="d">Now make sure that we're setup to use the correct startfiles:</para>
-<screen role="nodump" os="e"><userinput>grep -o '/usr/lib.*/crt[1in].* .*' dummy.log</userinput></screen>
+<screen os="e"><userinput>grep -o '/usr/lib.*/crt[1in].* .*' dummy.log</userinput></screen>
<para os="f">If everything is working correctly, there should be no errors,
and the output of the last command will be:</para>
@@ -85,7 +85,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
<para os="g">Verify that the compiler is searching for the correct header
files:</para>
-<screen role="nodump"><userinput>grep -B1 '^ /usr/include' dummy.log</userinput></screen>
+<screen><userinput>grep -B1 '^ /usr/include' dummy.log</userinput></screen>
<para os="h">This command should return successfully with the following output:</para>
@@ -94,7 +94,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
<para os="i">Next, verify that the new linker is being used with the correct search paths:</para>
-<screen role="nodump" os="j"><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
+<screen os="j"><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
<para os="k">If everything is working correctly, there should be no errors,
and the output of the last command will be:</para>
@@ -105,7 +105,7 @@ SEARCH_DIR("/lib");</computeroutput></screen>
<para os="l">Next make sure that we're using the correct libc:</para>
-<screen role="nodump" os="m"><userinput>grep "/lib/libc.so.6 " dummy.log</userinput></screen>
+<screen os="m"><userinput>grep "/lib/libc.so.6 " dummy.log</userinput></screen>
<para os="n">If everything is working correctly, there should be no errors,
and the output of the last command will be:</para>
@@ -114,7 +114,7 @@ SEARCH_DIR("/lib");</computeroutput></screen>
<para os="p">Lastly, make sure GCC is using the correct dynamic linker:</para>
-<screen role="nodump" os="q"><userinput>grep found dummy.log</userinput></screen>
+<screen os="q"><userinput>grep found dummy.log</userinput></screen>
<para os="r">If everything is working correctly, there should be no errors,
and the output of the last command will be (allowing for
@@ -130,6 +130,6 @@ SEARCH_DIR("/lib");</computeroutput></screen>
<para os="u">Once everything is working correctly, clean up the test files:</para>
-<screen role="nodump" os="v"><userinput>rm -v dummy.c a.out dummy.log</userinput></screen>
+<screen os="v"><userinput>rm -v dummy.c a.out dummy.log</userinput></screen>
</sect1>