diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 15:35:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 15:35:02 +0100 |
commit | 49313b0626356f4726dc3bd52b237bbb81928a36 (patch) | |
tree | 6c566f26d5d56a61f2d5eb814512893a12bcf4c5 /python3 | |
parent | a0a58556f36cbf396f5139e18881720ed838ddd4 (diff) |
Make python3 work with custom VALGRIND_CFLAGS
Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
Diffstat (limited to 'python3')
-rw-r--r-- | python3/ExternalProject_python3.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 85bbf8eb6dad..b7ed7bdb9d77 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -53,14 +53,22 @@ else # create a symlink "LO_lib" because the .so are in a directory with platform # specific name like build/lib.linux-x86_64-3.3 +python3_cflags = +ifeq ($(ENABLE_VALGRIND),TRUE) + python3_cflags += $(VALGRIND_CFLAGS) +endif +ifeq ($(OS),AIX) + python3_cflags += -g0 +endif + $(call gb_ExternalProject_get_state_target,python3,build) : cd $(EXTERNAL_WORKDIR) \ && ./configure \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ --with-system-expat \ - $(if $(strip $(VALGRIND_CFLAGS)),--with-valgrind) \ + $(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \ --prefix=/python-inst \ - $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads CFLAGS="-g0") \ + $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads) \ $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ --enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ @@ -71,6 +79,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(filter YES,$(SYSTEM_EXPAT)),, -I$(OUTDIR)/inc/external/expat) \ $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ )" \ + $(if $(python3_cflags),CFLAGS='$(python3_cflags)') \ LDFLAGS="$(strip $(LDFLAGS) \ $(if $(filter YES,$(SYSTEM_OPENSSL)),, -L$(OUTDIR)/lib) \ $(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(OUTDIR)/lib) \ |