| 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() { |
| 11 # We need to build a host version of ruby for use during the nacl | 11 # We need to build a host version of ruby for use during the nacl |
| 12 # build. | 12 # build. |
| 13 HOST_BUILD=${WORK_DIR}/build-nacl-host | 13 HOST_BUILD=${WORK_DIR}/build_host |
| 14 if [ ! -x ${HOST_BUILD}/inst/bin/ruby ]; then | 14 if [ ! -x ${HOST_BUILD}/inst/bin/ruby ]; then |
| 15 Banner "Building ruby for host" | 15 Banner "Building ruby for host" |
| 16 MakeDir ${HOST_BUILD} | 16 MakeDir ${HOST_BUILD} |
| 17 ChangeDir ${HOST_BUILD} | 17 ChangeDir ${HOST_BUILD} |
| 18 CFLAGS="" LDFLAGS="" LogExecute ${SRC_DIR}/configure --prefix=$PWD/inst | 18 CFLAGS="" LDFLAGS="" LogExecute ${SRC_DIR}/configure --prefix=$PWD/inst |
| 19 LogExecute make -j${OS_JOBS} miniruby | 19 LogExecute make -j${OS_JOBS} miniruby |
| 20 LogExecute make -j${OS_JOBS} install-nodoc | 20 LogExecute make -j${OS_JOBS} install-nodoc |
| 21 cd - | 21 cd - |
| 22 fi | 22 fi |
| 23 | 23 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 38 # does not know about "pnacl". It only knows about "le32-nacl". | 38 # does not know about "pnacl". It only knows about "le32-nacl". |
| 39 # Unfortunately, most of the config.subs here are so old that | 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". | 40 # it doesn't know about that "le32" either. So we just say "nacl". |
| 41 conf_host="nacl" | 41 conf_host="nacl" |
| 42 fi | 42 fi |
| 43 | 43 |
| 44 SetupCrossEnvironment | 44 SetupCrossEnvironment |
| 45 LogExecute ${SRC_DIR}/configure \ | 45 LogExecute ${SRC_DIR}/configure \ |
| 46 --host=${conf_host} \ | 46 --host=${conf_host} \ |
| 47 --prefix=/ \ | 47 --prefix=/ \ |
| 48 --with-baseruby=${WORK_DIR}/build-nacl-host/inst/bin/ruby \ | 48 --with-baseruby=${HOST_BUILD}/inst/bin/ruby \ |
| 49 --with-http=no \ | 49 --with-http=no \ |
| 50 --with-html=no \ | 50 --with-html=no \ |
| 51 --with-ftp=no \ | 51 --with-ftp=no \ |
| 52 --${NACL_OPTION}-mmx \ | 52 --${NACL_OPTION}-mmx \ |
| 53 --${NACL_OPTION}-sse \ | 53 --${NACL_OPTION}-sse \ |
| 54 --${NACL_OPTION}-sse2 \ | 54 --${NACL_OPTION}-sse2 \ |
| 55 --${NACL_OPTION}-asm \ | 55 --${NACL_OPTION}-asm \ |
| 56 --with-x=no \ | 56 --with-x=no \ |
| 57 ${EXTRA_CONFIGURE_ARGS} | 57 ${EXTRA_CONFIGURE_ARGS} |
| 58 } | 58 } |
| 59 | 59 |
| 60 BuildStep() { | 60 BuildStep() { |
| 61 DefaultBuildStep | 61 DefaultBuildStep |
| 62 if [ $NACL_ARCH == "pnacl" ]; then | 62 if [ $NACL_ARCH == "pnacl" ]; then |
| 63 # Just write the x86-64 version out for now. | 63 # Just write the x86-64 version out for now. |
| 64 TranslateAndWriteSelLdrScript ruby.pexe x86-64 ruby.x86-64.nexe ruby | 64 TranslateAndWriteSelLdrScript ruby.pexe x86-64 ruby.x86-64.nexe ruby |
| 65 fi | 65 fi |
| 66 } | 66 } |
| 67 | 67 |
| 68 InstallStep() { | 68 InstallStep() { |
| 69 DESTDIR=${DESTDIR}/${PREFIX} | 69 DESTDIR=${DESTDIR}/${PREFIX} |
| 70 DefaultInstallStep | 70 DefaultInstallStep |
| 71 } | 71 } |
| OLD | NEW |