Mercurial > mxe-octave
changeset 4945:76828d146a8d
icu4c.mk: Don't link with msvcr100 or force --std=gnu++0x. Set CPPFLAGS, not CFLAGS.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 29 Jan 2019 12:41:34 -0500 |
parents | 46e04d53b955 |
children | a99cf8dbe52d |
files | src/icu4c.mk |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/icu4c.mk Sat Jan 26 12:28:37 2019 -0500 +++ b/src/icu4c.mk Tue Jan 29 12:41:34 2019 -0500 @@ -29,8 +29,7 @@ --with-cross-build='$(1).native' \ PKG_CONFIG='$(MXE_PKG_CONFIG)' \ PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \ - CFLAGS='-DU_USING_ICU_NAMESPACE=0' \ - CXXFLAGS='--std=gnu++0x' LIBS=-lmsvcr100 + CPPFLAGS='-DU_USING_ICU_NAMESPACE=0' $(MAKE) -C '$(1).cross' -j '$(JOBS)' $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) $(MAKE) -C '$(1).cross' -j 1 install $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) DESTDIR='$(3)'