diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:43:54 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:43:54 +0000 |
| commit | 6b049efa8ba849a03ed347940fce34385a138f61 (patch) | |
| tree | c699754495ef0e2724c85e8f898c9dd197788b30 /icu | |
| parent | 258e186dd9f7e62306f722b3c455e8ea3fb0753b (diff) | |
INTEGRATION: CWS obo23 (1.38.4); FILE MERGED
2008/03/12 11:28:44 obo 1.38.4.2: #153712# fix for unxmacxi environment
2008/03/11 14:14:13 obo 1.38.4.1: #153712# fix for unxmacxi environment
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 138785091351..d85d722342e8 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.38 $ +# $Revision: 1.39 $ # -# last change: $Author: obo $ $Date: 2008-01-04 15:00:06 $ +# last change: $Author: vg $ $Date: 2008-03-18 14:43:54 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -72,13 +72,22 @@ icu_CFLAGS+=$(C_RESTRICTIONFLAGS) icu_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" +.IF "$(OS)"=="MACOSX" +.IF "$(EXTRA_CFLAGS)"!="" +CPP:=gcc -E $(EXTRA_CFLAGS) +CXX:=g++ $(EXTRA_CFLAGS) +CC:=gcc $(EXTRA_CFLAGS) +.EXPORT : CPP +.ENDIF # "$(EXTRA_CFLAGS)"!="" +.ENDIF # "$(OS)"=="MACOSX" + # Disable executable stack .IF "$(OS)$(COM)"=="LINUXGCC" icu_LDFLAGS+=-Wl,-z,noexecstack .ENDIF -icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CFLAGS) -icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CFLAGS) +icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) +icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) # until someone introduces SOLARIS 64-bit builds .IF "$(OS)"=="SOLARIS" |