OLD | NEW |
1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2011 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 NACLPORTS_CFLAGS+=" -std=gnu99" | 5 NACLPORTS_CFLAGS+=" -std=gnu99" |
6 | 6 |
7 AutogenStep() { | 7 AutogenStep() { |
8 ChangeDir ${SRC_DIR} | 8 ChangeDir ${SRC_DIR} |
9 # For some reason if we don't remove configure before running | 9 # For some reason if we don't remove configure before running |
10 # autoconf it doesn't always get updates correctly. About half | 10 # autoconf it doesn't always get updates correctly. About half |
11 # the time the old configure script (with no reference to nacl) | 11 # the time the old configure script (with no reference to nacl) |
12 # will remain after ./autogen.sh | 12 # will remain after ./autogen.sh |
13 rm -f configure | 13 rm -f configure |
14 ./autogen.sh | 14 ./autogen.sh |
15 PatchConfigure | 15 PatchConfigure |
16 PatchConfigSub | 16 PatchConfigSub |
17 cd - | 17 cd - |
18 } | 18 } |
19 | 19 |
20 ConfigureStep() { | 20 ConfigureStep() { |
21 AutogenStep | 21 AutogenStep |
22 SetupCrossEnvironment | 22 SetupCrossEnvironment |
23 | 23 |
24 local conf_host=${NACL_CROSS_PREFIX} | |
25 if [ ${NACL_ARCH} = "pnacl" ]; then | |
26 # The PNaCl tools use "pnacl-" as the prefix, but config.sub | |
27 # does not know about "pnacl". It only knows about "le32-nacl". | |
28 # Unfortunately, most of the config.subs here are so old that | |
29 # it doesn't know about that "le32" either. So we just say "nacl". | |
30 conf_host="nacl-pnacl" | |
31 fi | |
32 | |
33 LogExecute ${SRC_DIR}/configure \ | 24 LogExecute ${SRC_DIR}/configure \ |
34 --host=${conf_host} \ | 25 --host=${CONF_HOST} \ |
| 26 --build=${CONF_BUILD} \ |
35 --prefix=${PREFIX} \ | 27 --prefix=${PREFIX} \ |
36 --disable-assembly \ | 28 --disable-assembly \ |
37 --disable-pthread-sem | 29 --disable-pthread-sem |
38 } | 30 } |
OLD | NEW |