blob: 41d49801adc6d39b9496fe8a88e79b75ff90618e (
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
55
|
we need to override ARCHFLAG as well since this is set to either -m32 or -m64
and LDFLAGS add it explicitly which means when NATIVE_CC is defined then we build
the objects as 64bit but link them to be 32bit binary which may not fly
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: mozilla/security/coreconf/mkdepend/Makefile
===================================================================
--- mozilla.orig/security/coreconf/mkdepend/Makefile 2013-01-09 13:23:51.747694602 -0800
+++ mozilla/security/coreconf/mkdepend/Makefile 2013-01-09 13:56:27.003734720 -0800
@@ -64,11 +64,11 @@
endif
ifdef NATIVE_CC
-CC=$(NATIVE_CC)
+override CC=$(NATIVE_CC)
endif
ifdef NATIVE_FLAGS
-OS_CFLAGS=$(NATIVE_FLAGS)
+override OS_CFLAGS=$(NATIVE_FLAGS)
endif
include $(DEPTH)/coreconf/rules.mk
Index: mozilla/security/coreconf/nsinstall/Makefile
===================================================================
--- mozilla.orig/security/coreconf/nsinstall/Makefile 2013-01-09 13:23:51.747694602 -0800
+++ mozilla/security/coreconf/nsinstall/Makefile 2013-01-09 13:56:11.775734407 -0800
@@ -58,11 +58,11 @@
endif
ifdef NATIVE_CC
-CC=$(NATIVE_CC)
+override CC=$(NATIVE_CC)
endif
ifdef NATIVE_FLAGS
-OS_CFLAGS=$(NATIVE_FLAGS)
+override OS_CFLAGS=$(NATIVE_FLAGS)
endif
include $(DEPTH)/coreconf/rules.mk
Index: mozilla/security/coreconf/Linux.mk
===================================================================
--- mozilla.orig/security/coreconf/Linux.mk 2013-01-09 13:50:01.427726808 -0800
+++ mozilla/security/coreconf/Linux.mk 2013-01-09 13:55:58.815734141 -0800
@@ -98,6 +98,9 @@
endif
endif
+ifdef NATIVE_FLAGS
+ override ARCHFLAG=
+endif
LIBC_TAG = _glibc
|
