OLD | NEW |
1 #!/bin/sh | 1 #!/bin/sh |
2 | 2 |
3 function nacl_configure { | 3 function nacl_configure { |
4 # Copyright (c) 2011 Shinichiro Hamaji | 4 # Copyright (c) 2011 Shinichiro Hamaji |
5 if [ -z "$1" ]; then | 5 if [ -z "$1" ]; then |
6 PARAM= | 6 PARAM= |
7 else | 7 else |
8 PARAM=$1 | 8 PARAM=$1 |
9 fi | 9 fi |
10 #echo $(ls -d $NACL_SDK_ROOT/toolchain/* | grep $PARAM _newlib) | 10 #echo $(ls -d $NACL_SDK_ROOT/toolchain/* | grep $PARAM _newlib) |
11 if [ "x$NACL_TOOLCHAIN_ROOT" = "x" ]; then | 11 if [ "x$NACL_TOOLCHAIN_ROOT" = "x" ]; then |
12 SD=$NACL_SDK_ROOT/toolchain | 12 SD=$NACL_SDK_ROOT/toolchain |
13 export NACL_TOOLCHAIN_ROOT="$(ls -d $SD/* | grep $PARAM _glibc)" | 13 export NACL_TOOLCHAIN_ROOT="$(ls -d $SD/* | grep $PARAM _glibc)" |
14 if [ "x$NACL_TOOLCHAIN_ROOT" = "x" ]; then | 14 if [ "x$NACL_TOOLCHAIN_ROOT" = "x" ]; then |
15 echo "Failed to detect NACL_TOOLCHAIN_ROOT in $NACL_SDK_ROOT/toolchain." | 15 echo "Failed to detect NACL_TOOLCHAIN_ROOT in $NACL_SDK_ROOT/toolchain." |
16 echo "Set this environment variable manually." | 16 echo "Set this environment variable manually." |
17 exit 1 | 17 exit 1 |
18 fi | 18 fi |
19 if echo $NACL_TOOLCHAIN_ROOT | grep ' '; then | 19 if echo $NACL_TOOLCHAIN_ROOT | grep ' '; then |
20 echo "Multiple NACL_TOOLCHAIN_ROOT detected ($NACL_TOOLCHAIN_ROOT)" | 20 echo "Multiple NACL_TOOLCHAIN_ROOT detected ($NACL_TOOLCHAIN_ROOT)" |
21 echo "Set this environment manually." | 21 echo "Set this environment manually." |
22 exit 1 | 22 exit 1 |
23 fi | 23 fi |
24 fi | 24 fi |
25 | 25 |
26 export NACL_PACKAGES_BITSIZE=${NACL_PACKAGES_BITSIZE:-"32"} | 26 export NACL_ARCH=${NACL_ARCH:-"i686"} |
27 if [ $NACL_PACKAGES_BITSIZE = "32" ] ; then | 27 if [ $NACL_ARCH = "i686" ] ; then |
28 export ARCH=x86-32 | 28 export ARCH=x86-32 |
29 export LARCH=i686 | 29 export LARCH=i686 |
30 elif [ $NACL_PACKAGES_BITSIZE = "64" ] ; then | 30 export NACL_LIBDIR=lib32 |
| 31 elif [ $NACL_ARCH = "x86_64" ] ; then |
31 export LARCH=x86_64 | 32 export LARCH=x86_64 |
32 export ARCH=x86-64 | 33 export ARCH=x86-64 |
| 34 export NACL_LIBDIR=lib64 |
33 else | 35 else |
34 "Unknown value for NACL_PACKAGES_BITSIZE: '$NACL_PACKAGES_BITSIZE'" | 36 "Unknown value for NACL_ARCH: '$NACL_ARCH'" |
35 exit -1 | 37 exit -1 |
36 fi | 38 fi |
37 } | 39 } |
38 | 40 |
39 nacl_configure | 41 nacl_configure |
40 NACL_LIB_PATH=$NACL_TOOLCHAIN_ROOT/x86_64-nacl | 42 NACL_LIB_PATH=$NACL_TOOLCHAIN_ROOT/x86_64-nacl |
41 $NACL_SDK_ROOT/tools/create_nmf.py \ | 43 $NACL_SDK_ROOT/tools/create_nmf.py \ |
42 -L$NACL_LIB_PATH/usr/lib$NACL_PACKAGES_BITSIZE \ | 44 -L$NACL_LIB_PATH/usr/$NACL_LIBDIR \ |
43 -L$NACL_LIB_PATH/lib$NACL_PACKAGES_BITSIZE -o thttpd.nmf -s . \ | 45 -L$NACL_LIB_PATH/$NACL_LIBDIR -o thttpd.nmf -s . \ |
44 thttpd_x86-$NACL_PACKAGES_BITSIZE.nexe | 46 thttpd_$NACL_ARCH |
OLD | NEW |