]>
Commit | Line | Data |
---|---|---|
c96c8eda ER |
1 | --- mozilla/configure.in~ 2009-07-29 22:40:48.000000000 +0300 |
2 | +++ mozilla/configure.in 2009-07-29 22:41:17.255773820 +0300 | |
3 | @@ -250,98 +250,8 @@ | |
4 | esac | |
5 | ||
6 | if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then | |
7 | - echo "cross compiling from $host to $target" | |
8 | - cross_compiling=yes | |
9 | - | |
10 | - _SAVE_CC="$CC" | |
11 | - _SAVE_CFLAGS="$CFLAGS" | |
12 | - _SAVE_LDFLAGS="$LDFLAGS" | |
13 | - | |
14 | - AC_MSG_CHECKING([for host c compiler]) | |
15 | - AC_CHECK_PROGS(HOST_CC, $HOST_CC gcc cc /usr/ucb/cc cl icc, "") | |
16 | - if test -z "$HOST_CC"; then | |
17 | - AC_MSG_ERROR([no acceptable c compiler found in \$PATH]) | |
18 | - fi | |
19 | - AC_MSG_RESULT([$HOST_CC]) | |
20 | - AC_MSG_CHECKING([for host c++ compiler]) | |
21 | - AC_CHECK_PROGS(HOST_CXX, $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc, "") | |
22 | - if test -z "$HOST_CXX"; then | |
23 | - AC_MSG_ERROR([no acceptable c++ compiler found in \$PATH]) | |
24 | - fi | |
25 | - AC_MSG_RESULT([$HOST_CXX]) | |
26 | - | |
27 | - if test -z "$HOST_CFLAGS"; then | |
28 | - HOST_CFLAGS="$CFLAGS" | |
29 | - fi | |
30 | - if test -z "$HOST_CXXFLAGS"; then | |
31 | - HOST_CXXFLAGS="$CXXFLAGS" | |
32 | - fi | |
33 | - if test -z "$HOST_LDFLAGS"; then | |
34 | - HOST_LDFLAGS="$LDFLAGS" | |
35 | - fi | |
36 | - AC_CHECK_PROGS(HOST_RANLIB, $HOST_RANLIB ranlib, ranlib, :) | |
37 | - AC_CHECK_PROGS(HOST_AR, $HOST_AR ar, ar, :) | |
38 | - CC="$HOST_CC" | |
39 | - CFLAGS="$HOST_CFLAGS" | |
40 | - LDFLAGS="$HOST_LDFLAGS" | |
41 | - | |
42 | - AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) | |
43 | - AC_TRY_COMPILE([], [return(0);], | |
44 | - [ac_cv_prog_hostcc_works=1 | |
45 | - AC_MSG_RESULT([yes])], | |
46 | - AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) ) | |
47 | - | |
48 | - CC="$HOST_CXX" | |
49 | - CFLAGS="$HOST_CXXFLAGS" | |
50 | - | |
51 | - AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works]) | |
52 | - AC_TRY_COMPILE([], [return(0);], | |
53 | - [ac_cv_prog_hostcxx_works=1 | |
54 | - AC_MSG_RESULT([yes])], | |
55 | - AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) ) | |
56 | - | |
57 | - CC=$_SAVE_CC | |
58 | - CFLAGS=$_SAVE_CFLAGS | |
59 | - LDFLAGS=$_SAVE_LDFLAGS | |
60 | - | |
61 | - case "$build:$target" in | |
62 | - powerpc-apple-darwin8*:i?86-apple-darwin*) | |
63 | - dnl The Darwin cross compiler doesn't necessarily point itself at a | |
64 | - dnl root that has libraries for the proper architecture, it defaults | |
65 | - dnl to the system root. The libraries in the system root on current | |
66 | - dnl versions of PPC OS X 10.4 aren't fat, so these target compiler | |
67 | - dnl checks will fail. Fake a working SDK in that case. | |
68 | - _SAVE_CFLAGS=$CFLAGS | |
69 | - _SAVE_CXXFLAGS=$CXXLAGS | |
70 | - CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS" | |
71 | - CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS" | |
72 | - ;; | |
73 | - esac | |
74 | - | |
75 | - AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :) | |
76 | - unset ac_cv_prog_CC | |
77 | - AC_PROG_CC | |
78 | - AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :) | |
79 | - unset ac_cv_prog_CXX | |
80 | - AC_PROG_CXX | |
81 | - | |
82 | - case "$build:$target" in | |
83 | - powerpc-apple-darwin8*:i?86-apple-darwin*) | |
84 | - dnl Revert the changes made above. From this point on, the target | |
85 | - dnl compiler will never be used without applying the SDK to CFLAGS | |
86 | - dnl (see --with-macos-sdk below). | |
87 | - CFLAGS=$_SAVE_CFLAGS | |
88 | - CXXFLAGS=$_SAVE_CXXFLAGS | |
89 | - ;; | |
90 | - esac | |
91 | - | |
92 | - AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :) | |
93 | - AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :) | |
94 | - AC_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :) | |
95 | - AC_CHECK_PROGS(LD, $LD "${target_alias}-ld" "${target}-ld", :) | |
96 | - AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :) | |
97 | - AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :) | |
98 | - AC_DEFINE(CROSS_COMPILE) | |
99 | + echo >&2 Cross compile block breaks whole configure script | |
100 | + exit 1 | |
101 | else | |
102 | AC_PROG_CC | |
103 | AC_PROG_CXX |