Changeset 2643b9b4 for BOOK/final-system/multilib/zlib.xml

Timestamp:

Apr 16, 2011, 5:46:52 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Children:

441840b

Parents:

af43a09 (diff), e0ad6ee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into simp

File:

• BOOK/final-system/multilib/zlib.xml (modified) (1 diff)

BOOK/final-system/multilib/zlib.xml

@@ -28 +28 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
-    CXX="g++ -isystem /usr/include ${BUILD32}" \
-    LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
-    ./configure --prefix=/usr</userinput></screen>
+CXX="g++ -isystem /usr/include ${BUILD32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+  ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"