From 2b03e0ba521b7b439e5da6ce73545dd4f2c49a8b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 2 Mar 2020 19:58:07 +0100 Subject: Revert "ofz#20976 build-failure" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5b22433d79823372744038c5ae28094bc938fb48. Reason for revert: Change-Id: I4a104ca86dadbcc7f797df41326d48a53ca1c990 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89800 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- codemaker/Executable_cppumaker.mk | 4 ---- codemaker/Executable_javamaker.mk | 4 ---- 2 files changed, 8 deletions(-) (limited to 'codemaker') diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index f81577b732b0..41ca490718d7 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,cppumaker)) $(eval $(call gb_Executable_use_external,cppumaker,boost_headers)) -ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_Executable_use_external,cppumaker,dtoa)) -endif - $(eval $(call gb_Executable_use_libraries,cppumaker,\ unoidl \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk index 135860e87dfe..febfe9a71c29 100644 --- a/codemaker/Executable_javamaker.mk +++ b/codemaker/Executable_javamaker.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,javamaker)) $(eval $(call gb_Executable_use_external,javamaker,boost_headers)) -ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_Executable_use_external,javamaker,dtoa)) -endif - $(eval $(call gb_Executable_use_libraries,javamaker,\ unoidl \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ -- cgit