| OLD | NEW |
| 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2014 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 export EXTRA_LIBS="${NACL_CLI_MAIN_LIB}" | 5 export EXTRA_LIBS="${NACL_CLI_MAIN_LIB}" |
| 6 NACLPORTS_CPPFLAGS+=" -Dpipe=nacl_spawn_pipe" |
| 6 | 7 |
| 7 # --with-build-sysroot is necessary to run "fixincl" | 8 # --with-build-sysroot is necessary to run "fixincl" |
| 8 # properly. Without this option, GCC's build system tries to create | 9 # properly. Without this option, GCC's build system tries to create |
| 9 # "include-fixed" based on the host's include directory, which is | 10 # "include-fixed" based on the host's include directory, which is |
| 10 # not compatible with nacl-gcc. | 11 # not compatible with nacl-gcc. |
| 11 EXTRA_CONFIGURE_ARGS="\ | 12 EXTRA_CONFIGURE_ARGS="\ |
| 12 --enable-languages=c,c++ --disable-nls \ | 13 --enable-languages=c,c++ --disable-nls \ |
| 13 --target=x86_64-nacl \ | 14 --target=x86_64-nacl \ |
| 14 --disable-libstdcxx-pch --enable-threads=nacl" | 15 --disable-libstdcxx-pch --enable-threads=nacl" |
| 15 | 16 |
| 16 # Force gcc to think that makeinfo is old so it won't build documentation. | 17 # Force gcc to think that makeinfo is old so it won't build documentation. |
| 17 # Actually the issue is that its too new on most installs these days | 18 # Actually the issue is that its too new on most installs these days |
| 18 # (Ubunut/Trusty for example) and causes the build to break. | 19 # (Ubunut/Trusty for example) and causes the build to break. |
| 19 export gcc_cv_prog_makeinfo_modern=no | 20 export gcc_cv_prog_makeinfo_modern=no |
| 20 | 21 |
| 21 ConfigureStep() { | 22 ConfigureStep() { |
| 22 DefaultConfigureStep | 23 DefaultConfigureStep |
| 23 for cache_file in $(find . -name config.cache); do | 24 for cache_file in $(find . -name config.cache); do |
| 24 Remove $cache_file | 25 Remove $cache_file |
| 25 done | 26 done |
| 26 } | 27 } |
| OLD | NEW |