blob: f4ff51fae1f4200b42e15070019404183bb93089 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
--- mozilla/nsprpub/config/rules.mk.old
+++ mozilla/nsprpub/config/rules.mk
@@ -87,6 +87,9 @@
CCC=$(HOST_CXX)
CFLAGS=$(HOST_CFLAGS)
CXXFLAGS=$(HOST_CXXFLAGS)
+LDFLAGS=$(HOST_LDFLAGS)
+RANLIB=$(HOST_RANLIB)
+AR=$(HOST_AR)
endif
endif
endif
--- mozilla/configure.in.old
+++ mozilla/configure.in
@@ -6098,12 +6098,17 @@
if test -n "$CROSS_COMPILE"; then
if test -z "$HOST_LIBIDL_CONFIG"; then
+ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
if test -n "$HOST_LIBIDL_CONFIG"; then
+ AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host])
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+ AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS])
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+ AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS])
else
+ AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS])
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
fi
--- mozilla/configure.old
+++ mozilla/configure
@@ -17604,11 +17604,18 @@
if test -n "$CROSS_COMPILE"; then
if test -z "$HOST_LIBIDL_CONFIG"; then
+ echo "HOST_LIBIDL_CONFIG nto defined"
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
- if test -n "$HOST_LIBIDL_CONFIG"; then
+ if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then
+ echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH"
+ _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+ echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+ echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS"
+ PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH
else
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
|
