Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/cross-tools/common/gcc-final.xml

    r88ef769 r03e6a40  
    6868  --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
    6969  --with-gmp=/cross-tools --with-cloog=/cross-tools \
    70   --enable-cloog-backend=isl --with-isl=/cross-tools \
    71   --disable-isl-version-check --with-system-zlib --enable-checking=release \
     70  --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
    7271  --enable-libstdcxx-time</userinput></screen>
    7372
     
    114113      </varlistentry>
    115114
     115      <varlistentry os="bg6">
     116        <term><parameter>--enable-libstdcxx-time</parameter></term>
     117        <listitem>
     118          <para>This enables link-time checks for the availability of
     119          clock_gettime clocks, and nanosleep and sched_yield functions, in the
     120          C library.</para>
     121        </listitem>
     122      </varlistentry>
     123
    116124    </variablelist>
    117125
Note: See TracChangeset for help on using the changeset viewer.