| OLD | NEW |
| 1 # Copyright 2016 The Native Client Authors. All rights reserved. | 1 # Copyright 2016 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 EnableCliMain | 5 EnableCliMain |
| 6 EnableGlibcCompat | 6 EnableGlibcCompat |
| 7 EXTRA_CONFIGURE_ARGS+=" --without-gtk --with-nettle" | 7 EXTRA_CONFIGURE_ARGS+=" --without-gtk --with-nettle" |
| 8 EXECUTABLES=stoken${NACL_EXEEXT} | 8 EXECUTABLES=stoken${NACL_EXEEXT} |
| 9 | 9 |
| 10 # Workaround for pthread link order problem (copied from libarchive). | 10 # Workaround for pthread link order problem (copied from libarchive). |
| 11 export LIBS="-lpthread -lm" | 11 export LIBS="-lpthread -lm" |
| 12 | 12 |
| 13 TestStep() { | 13 TestStep() { |
| 14 if [ "${NACL_SHARED}" = "1" ]; then | 14 if [ "${NACL_SHARED}" = "1" ]; then |
| 15 EXE=.libs/stoken${NACL_EXEEXT} | 15 EXE=.libs/stoken${NACL_EXEEXT} |
| 16 export SEL_LDR_LIB_PATH=${BUILD_DIR}/.libs | 16 export SEL_LDR_LIB_PATH=${BUILD_DIR}/.libs |
| 17 else | 17 else |
| 18 EXE=stoken${NACL_EXEEXT} | 18 EXE=stoken${NACL_EXEEXT} |
| 19 fi | 19 fi |
| 20 | 20 |
| 21 if [ "${NACL_ARCH}" = "pnacl" ]; then | 21 if [ "${NACL_ARCH}" = "pnacl" -o "${NACL_ARCH}" = "le32" ]; then |
| 22 TranslateAndWriteLauncherScript ${EXE} x86-32 stoken.x86-32.nexe stoken | 22 TranslateAndWriteLauncherScript ${EXE} x86-32 stoken.x86-32.nexe stoken |
| 23 else | 23 else |
| 24 WriteLauncherScript stoken ${EXE} | 24 WriteLauncherScript stoken ${EXE} |
| 25 fi | 25 fi |
| 26 | 26 |
| 27 LogExecute make check | 27 LogExecute make check |
| 28 } | 28 } |
| OLD | NEW |