| OLD | NEW |
| 1 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2013 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 MAKE_TARGETS="pprogram" | 5 MAKE_TARGETS="pprogram" |
| 6 INSTALL_TARGETS="install-nodoc" | 6 INSTALL_TARGETS="install-nodoc" |
| 7 | 7 |
| 8 EXECUTABLES="ruby${NACL_EXEEXT} pepper-ruby${NACL_EXEEXT}" | 8 EXECUTABLES="ruby${NACL_EXEEXT} pepper-ruby${NACL_EXEEXT}" |
| 9 | 9 |
| 10 ConfigureStep() { | 10 ConfigureStep() { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 EXTRA_CONFIGURE_ARGS=--disable-ipv6 | 25 EXTRA_CONFIGURE_ARGS=--disable-ipv6 |
| 26 | 26 |
| 27 EnableGlibcCompat | 27 EnableGlibcCompat |
| 28 | 28 |
| 29 if [ "${NACL_LIBC}" = "newlib" ]; then | 29 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 30 EXTRA_CONFIGURE_ARGS+=" --with-static-linked-ext --with-newlib" | 30 EXTRA_CONFIGURE_ARGS+=" --with-static-linked-ext --with-newlib" |
| 31 else | 31 else |
| 32 EXTRA_CONFIGURE_ARGS+=" --with-out-ext=openssl,digest/*" | 32 EXTRA_CONFIGURE_ARGS+=" --with-out-ext=openssl,digest/*" |
| 33 fi | 33 fi |
| 34 | 34 |
| 35 local conf_host=${NACL_CROSS_PREFIX} | |
| 36 if [ ${NACL_ARCH} = "pnacl" ]; then | |
| 37 # The PNaCl tools use "pnacl-" as the prefix, but config.sub | |
| 38 # does not know about "pnacl". It only knows about "le32-nacl". | |
| 39 # Unfortunately, most of the config.subs here are so old that | |
| 40 # it doesn't know about that "le32" either. So we just say "nacl". | |
| 41 conf_host="nacl" | |
| 42 fi | |
| 43 | |
| 44 SetupCrossEnvironment | 35 SetupCrossEnvironment |
| 45 LogExecute ${SRC_DIR}/configure \ | 36 LogExecute ${SRC_DIR}/configure \ |
| 46 --host=${conf_host} \ | 37 --host=${CONF_HOST} \ |
| 38 --build=${CONF_BUILD} \ |
| 47 --prefix=/ \ | 39 --prefix=/ \ |
| 48 --with-baseruby=${HOST_BUILD}/inst/bin/ruby \ | 40 --with-baseruby=${HOST_BUILD}/inst/bin/ruby \ |
| 49 --with-http=no \ | 41 --with-http=no \ |
| 50 --with-html=no \ | 42 --with-html=no \ |
| 51 --with-ftp=no \ | 43 --with-ftp=no \ |
| 52 --${NACL_OPTION}-mmx \ | 44 --${NACL_OPTION}-mmx \ |
| 53 --${NACL_OPTION}-sse \ | 45 --${NACL_OPTION}-sse \ |
| 54 --${NACL_OPTION}-sse2 \ | 46 --${NACL_OPTION}-sse2 \ |
| 55 --${NACL_OPTION}-asm \ | 47 --${NACL_OPTION}-asm \ |
| 56 --with-x=no \ | 48 --with-x=no \ |
| 57 ${EXTRA_CONFIGURE_ARGS} | 49 ${EXTRA_CONFIGURE_ARGS} |
| 58 } | 50 } |
| 59 | 51 |
| 60 BuildStep() { | 52 BuildStep() { |
| 61 DefaultBuildStep | 53 DefaultBuildStep |
| 62 if [ $NACL_ARCH == "pnacl" ]; then | 54 if [ $NACL_ARCH == "pnacl" ]; then |
| 63 # Just write the x86-64 version out for now. | 55 # Just write the x86-64 version out for now. |
| 64 TranslateAndWriteLauncherScript ruby.pexe x86-64 ruby.x86-64.nexe ruby | 56 TranslateAndWriteLauncherScript ruby.pexe x86-64 ruby.x86-64.nexe ruby |
| 65 fi | 57 fi |
| 66 } | 58 } |
| 67 | 59 |
| 68 InstallStep() { | 60 InstallStep() { |
| 69 DESTDIR=${DESTDIR}/${PREFIX} | 61 DESTDIR=${DESTDIR}/${PREFIX} |
| 70 DefaultInstallStep | 62 DefaultInstallStep |
| 71 } | 63 } |
| OLD | NEW |