Changeset e46e077


Ignore:
Timestamp:
2008-04-02T15:39:40Z (12 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
c4a1036
Parents:
1a57b893 (diff), f1e7407 (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 cross compilation patch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r1a57b893 re46e077  
    7474--ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
    7575                                                        $ssl
    76 --arch=...  Override target architecture $arch
    77 
     76
     77--target=...    Cross compilation target                same as host
    7878EOF
    7979                exit;
     
    134134EOF
    135135
     136if [ -n "$target" ]; then
     137        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
     138        PATH=/usr/$target/bin:$PATH
     139        CC=$target-cc
     140        LD=$target-ld
     141fi
     142
    136143if [ "$debug" = "1" ]; then
    137144        [ -z "$CFLAGS" ] && CFLAGS=-g
     
    160167echo "CC=$CC" >> Makefile.settings;
    161168
    162 if [ -n "$LD" ]; then
    163         echo "LD=$LD" >> Makefile.settings;
    164 elif type ld > /dev/null 2> /dev/null; then
    165         echo "LD=ld" >> Makefile.settings;
    166 else
    167         echo 'Cannot find ld, aborting.'
    168         exit 1;
    169 fi
     169if [ -z "$LD" ]; then
     170        if type ld > /dev/null 2> /dev/null; then
     171                LD=ld
     172        else
     173                echo 'Cannot find ld, aborting.'
     174                exit 1;
     175        fi
     176fi
     177
     178echo "LD=$LD" >> Makefile.settings
    170179
    171180if [ -z "$PKG_CONFIG" ]; then
     
    505514esac
    506515
     516if [ -n "$target" ]; then
     517        echo "Cross-compiling for: $target"
     518fi
     519
    507520echo
    508521echo 'Configuration done:'
Note: See TracChangeset for help on using the changeset viewer.