| OLD | NEW |
| 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # Environment variable NACL_ARCH should be set to one of the following | 5 # Environment variable NACL_ARCH should be set to one of the following |
| 6 # values: i686 x86_64 pnacl arm | 6 # values: i686 x86_64 pnacl arm |
| 7 | 7 |
| 8 | 8 |
| 9 # NAMING CONVENTION | 9 # NAMING CONVENTION |
| 10 # ================= | 10 # ================= |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 # For the library path we always explicitly add to the link flags | 60 # For the library path we always explicitly add to the link flags |
| 61 # otherwise 'libtool' won't find the libraries correctly. This | 61 # otherwise 'libtool' won't find the libraries correctly. This |
| 62 # is because libtool uses 'gcc -print-search-dirs' which does | 62 # is because libtool uses 'gcc -print-search-dirs' which does |
| 63 # not honor the external specs file. | 63 # not honor the external specs file. |
| 64 NACLPORTS_LDFLAGS="${NACL_LDFLAGS}" | 64 NACLPORTS_LDFLAGS="${NACL_LDFLAGS}" |
| 65 NACLPORTS_LDFLAGS+=" -L${NACLPORTS_LIBDIR} -Wl,-rpath-link=${NACLPORTS_LIBDIR}" | 65 NACLPORTS_LDFLAGS+=" -L${NACLPORTS_LIBDIR} -Wl,-rpath-link=${NACLPORTS_LIBDIR}" |
| 66 | 66 |
| 67 # The NaCl version of ARM gcc emits warnings about va_args that | 67 # The NaCl version of ARM gcc emits warnings about va_args that |
| 68 # are not particularly useful | 68 # are not particularly useful |
| 69 if [ "${NACL_ARCH}" = "arm" ]; then | 69 if [ "${NACL_ARCH}" = "arm" -a "${TOOLCHAIN}" = "newlib" ]; then |
| 70 NACLPORTS_CFLAGS="${NACLPORTS_CFLAGS} -Wno-psabi" | 70 NACLPORTS_CFLAGS="${NACLPORTS_CFLAGS} -Wno-psabi" |
| 71 NACLPORTS_CXXFLAGS="${NACLPORTS_CXXFLAGS} -Wno-psabi" | 71 NACLPORTS_CXXFLAGS="${NACLPORTS_CXXFLAGS} -Wno-psabi" |
| 72 fi | 72 fi |
| 73 | 73 |
| 74 if [ "${NACL_ARCH}" = "emscripten" ]; then | 74 if [ "${NACL_ARCH}" = "emscripten" ]; then |
| 75 NACLPORTS_CFLAGS+=" -Wno-warn-absolute-paths" | 75 NACLPORTS_CFLAGS+=" -Wno-warn-absolute-paths" |
| 76 NACLPORTS_CXXFLAGS+=" -Wno-warn-absolute-paths" | 76 NACLPORTS_CXXFLAGS+=" -Wno-warn-absolute-paths" |
| 77 fi | 77 fi |
| 78 | 78 |
| 79 # configure spec for if MMX/SSE/SSE2/Assembly should be enabled/disabled | 79 # configure spec for if MMX/SSE/SSE2/Assembly should be enabled/disabled |
| (...skipping 1478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1558 # These functions are called when this script is imported to do | 1558 # These functions are called when this script is imported to do |
| 1559 # any essential checking/setup operations. | 1559 # any essential checking/setup operations. |
| 1560 ###################################################################### | 1560 ###################################################################### |
| 1561 CheckToolchain | 1561 CheckToolchain |
| 1562 CheckPatchVersion | 1562 CheckPatchVersion |
| 1563 PatchSpecsFile | 1563 PatchSpecsFile |
| 1564 InjectSystemHeaders | 1564 InjectSystemHeaders |
| 1565 InstallConfigSite | 1565 InstallConfigSite |
| 1566 GetRevision | 1566 GetRevision |
| 1567 MakeDirs | 1567 MakeDirs |
| OLD | NEW |