summaryrefslogtreecommitdiff
path: root/moz/makefile.mk
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-04-20 16:13:30 +0200
committerVladimir Glazunov <vg@openoffice.org>2010-04-20 16:13:30 +0200
commita979bea9accc5d696af083f651ffa56cba5da27d (patch)
tree88d04dc94c863462f3b52c9785b4e57cec198dfb /moz/makefile.mk
parent11a8887e1fca7b9273d61c9cab4041688aee9c6f (diff)
parent27a769544799e45c1d91911c961edc76c070e0f4 (diff)
unxlnginewbaseline: merge with DEV300_m76
Diffstat (limited to 'moz/makefile.mk')
-rw-r--r--moz/makefile.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk
index d827266fab50..43ad99919d17 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -83,7 +83,8 @@ TARFILE_ROOTDIR=mozilla
PATCH_FILES = \
seamonkey-source-$(MOZILLA_VERSION).patch \
patches/dtoa.patch \
- patches/respect_disable_pango.patch
+ patches/respect_disable_pango.patch \
+ patches/arm_build_fix.patch
.IF "$(OUTPATH)"=="unxlngi6"
PATCH_FILES += patches/linux_libc2.5.patch
@@ -167,7 +168,7 @@ MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT)
# create a objdir build = build files in a seperate directory, not in the sourcetree directly
CONFIGURE_DIR=$(CPU)_objdir
BUILD_DIR=$(CONFIGURE_DIR)
-MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="gcc -arch $(MOZ_ARCH)" CXX="g++ -arch $(MOZ_ARCH)" AR=ar
+MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch $(MOZ_ARCH)" AR=ar
CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)