Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | nss: fix support cross compiling |
| 2 | |
| 3 | Let some make variables be assigned from outside makefile. |
| 4 | |
| 5 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 6 | Upstream-Status: Inappropriate [configuration] |
| 7 | --- |
| 8 | nss/coreconf/Linux.mk | 12 +++++++++++- |
| 9 | nss/coreconf/arch.mk | 2 +- |
| 10 | nss/lib/freebl/Makefile | 6 ++++++ |
| 11 | 3 files changed, 18 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk |
| 14 | --- a/nss/coreconf/Linux.mk |
| 15 | +++ b/nss/coreconf/Linux.mk |
| 16 | @@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1) |
| 17 | IMPL_STRATEGY = _PTH |
| 18 | endif |
| 19 | |
| 20 | +ifndef CC |
| 21 | CC = gcc |
| 22 | +endif |
| 23 | + |
| 24 | +ifdef CXX |
| 25 | +CCC = $(CXX) |
| 26 | +else |
| 27 | CCC = g++ |
| 28 | +endif |
| 29 | + |
| 30 | +ifndef RANLIB |
| 31 | RANLIB = ranlib |
| 32 | +endif |
| 33 | |
| 34 | -DEFAULT_COMPILER = gcc |
| 35 | +DEFAULT_COMPILER = $(CC) |
| 36 | |
| 37 | ifeq ($(OS_TARGET),Android) |
| 38 | ifndef ANDROID_NDK |
| 39 | diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk |
| 40 | index 6557348..b722412 100644 |
| 41 | --- a/nss/coreconf/arch.mk |
| 42 | +++ b/nss/coreconf/arch.mk |
| 43 | @@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m) |
| 44 | ifeq ($(OS_TEST),i86pc) |
| 45 | OS_RELEASE := $(shell uname -r)_$(OS_TEST) |
| 46 | else |
| 47 | - OS_RELEASE := $(shell uname -r) |
| 48 | + OS_RELEASE ?= $(shell uname -r) |
| 49 | endif |
| 50 | |
| 51 | # |
| 52 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile |
| 53 | index 0d293f1..678f506 100644 |
| 54 | --- a/nss/lib/freebl/Makefile |
| 55 | +++ b/nss/lib/freebl/Makefile |
| 56 | @@ -36,6 +36,12 @@ ifdef USE_64 |
| 57 | DEFINES += -DNSS_USE_64 |
| 58 | endif |
| 59 | |
| 60 | +ifeq ($(OS_TEST),mips) |
| 61 | +ifndef USE_64 |
| 62 | + DEFINES += -DNS_PTR_LE_32 |
| 63 | +endif |
| 64 | +endif |
| 65 | + |
| 66 | ifdef USE_ABI32_FPU |
| 67 | DEFINES += -DNSS_USE_ABI32_FPU |
| 68 | endif |
| 69 | -- |
| 70 | 1.8.1.2 |
| 71 | |