diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-04-20 16:13:30 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-04-20 16:13:30 +0200 |
| commit | a979bea9accc5d696af083f651ffa56cba5da27d (patch) | |
| tree | 88d04dc94c863462f3b52c9785b4e57cec198dfb /moz/makefile.mk | |
| parent | #i109357# changes for glibc2.5 (diff) | |
| parent | CWS-TOOLING: integrate CWS mingwport29 (diff) | |
| download | core-a979bea9accc5d696af083f651ffa56cba5da27d.tar.gz core-a979bea9accc5d696af083f651ffa56cba5da27d.zip | |
unxlnginewbaseline: merge with DEV300_m76
Diffstat (limited to 'moz/makefile.mk')
| -rw-r--r-- | moz/makefile.mk | 5 |
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) |