diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-14 14:31:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-09-14 14:39:25 +0300 |
| commit | 24c66413176cdb64eccb21e204bc61c933f2732d (patch) | |
| tree | a98b80c0467091f5fa299f2d0a7c6dca156751bf /cppunit/makefile.mk | |
| parent | 085446cf8501f2b820628b106fdb5dd4c375d13f (diff) | |
Adapt for DISABLE_DYNLOADING possibility also for Android
Change-Id: Iecc8c35b5b2235bc3408f2ecf3969317ac8bf679
Diffstat (limited to 'cppunit/makefile.mk')
| -rw-r--r-- | cppunit/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 95367596d82c..9dab3ca133cb 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -42,6 +42,10 @@ PATCH_FILES += android.patch PATCH_FILES += ios.patch .ENDIF +.IF "$(DISABLE_DYNLOADING)" == "TRUE" +PATCH_FILES += disable-dynloading.patch +.ENDIF + .IF "$(OS)" == "WNT" .IF "$(COM)" == "MSC" @@ -148,7 +152,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ LDFLAGS='$(LDFLAGS)' \ LIBS='$(MY_LIBS)' -.IF "$(OS)"=="IOS" +.IF "$(DISABLE_DYNLOADING)" == "TRUE" CONFIGURE_FLAGS+=--disable-shared .ELSE CONFIGURE_FLAGS+=--disable-static @@ -173,7 +177,7 @@ PACKAGE_DIR = \ OUT2LIB = ooo-install/lib/libcppunit-1.13.a .ELIF "$(OS)" == "OPENBSD" OUT2LIB = ooo-install/lib/libcppunit-1.13.so.0.0 -.ELIF "$(OS)" == "IOS" +.ELIF "$(DISABLE_DYNLOADING)" == "TRUE" OUT2LIB = ooo-install/lib/libcppunit.a .ELIF "$(OS)" == "ANDROID" OUT2LIB = ooo-install/lib/libcppunit-1.13.so |