summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-07-27 15:44:32 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2012-07-27 17:20:04 +0200
commit2c0ea81b99289c373a7c2cc4817c8fcfb6620fa4 (patch)
tree25884524d245d2cffaa93d0119715dbb84ec7213
parentadd regression test for #i19716# (diff)
downloadcore-2c0ea81b99289c373a7c2cc4817c8fcfb6620fa4.tar.gz
core-2c0ea81b99289c373a7c2cc4817c8fcfb6620fa4.zip
disable building the icu samples
Change-Id: I8e8fbb33bcb008d45f539a112b4bf210603286c9
-rw-r--r--icu/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk
index d1051accca3b..08fa3c66c7e2 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -149,7 +149,7 @@ icu_LDFLAGS+=-lgnustl_shared
.ENDIF
CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \
-./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) $(LIBRARY_SUFFIX)'
+./configure --enable-layout --disable-samples $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) $(LIBRARY_SUFFIX)'
.IF "$(OS)" == "MACOSX"
CONFIGURE_ACTION += \
@@ -229,7 +229,7 @@ BUILD_AND_HOST=--build=i586-pc-mingw32 --enable-64bit-libs=no
.ENDIF
CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" \
-./configure $(BUILD_AND_HOST) --enable-layout --disable-static --enable-shared'
+./configure $(BUILD_AND_HOST) --enable-layout --disable-static --enable-shared --disable-samples'
CONFIGURE_FLAGS=