|
Lines 76-87
Link Here
|
| 76 |
endif |
76 |
endif |
| 77 |
endif |
77 |
endif |
| 78 |
|
78 |
|
|
|
79 |
ABS_DIST := $(shell cd $(DIST) && pwd) |
| 80 |
ifeq ($(HOST_OS_ARCH),WINNT) |
| 81 |
ifdef CYGDRIVE_MOUNT |
| 82 |
ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') |
| 83 |
endif |
| 84 |
endif |
| 85 |
NSPR_INCLUDE_DIR = $(firstword $(filter -I%,$(NSPR_CFLAGS))) |
| 86 |
ifneq (,$(strip $(NSPR_INCLUDE_DIR))) |
| 87 |
NSPR_INCLUDE_DIR := $(subst -I,,$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_INCLUDE_DIR))) |
| 88 |
else |
| 89 |
NSPR_INCLUDE_DIR = $(ABS_DIST)/include/nspr |
| 90 |
endif |
| 91 |
NSPR_LIB_DIR = $(firstword $(filter -L%,$(NSPR_LIBS))) |
| 92 |
ifneq (,$(strip $(NSPR_LIB_DIR))) |
| 93 |
NSPR_LIB_DIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIB_DIR))) |
| 94 |
else |
| 95 |
NSPR_LIB_DIR = $(ABS_DIST)/lib |
| 96 |
endif |
| 79 |
# NSS makefiles are not safe for parallel execution. |
97 |
# NSS makefiles are not safe for parallel execution. |
| 80 |
DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 |
98 |
DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 |
| 81 |
DEFAULT_GMAKE_FLAGS += CC="$(CC)" |
99 |
DEFAULT_GMAKE_FLAGS += CC="$(CC)" |
| 82 |
DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" |
100 |
DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES=-I$(ABS_DIST)/include/dbm |
| 83 |
DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist |
101 |
DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) |
| 84 |
DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist |
102 |
DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) |
|
|
103 |
DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=$(NSPR_INCLUDE_DIR) |
| 104 |
DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) |
| 85 |
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 |
105 |
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 |
| 86 |
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 |
106 |
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 |
| 87 |
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) |
107 |
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) |
