[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

[jan Iversen]

 bridges/Library_cpp_uno.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 32288245d57765821172182cbd132489d404db88
Author: jan Iversen <jani at libreoffice.org>
Date:   Wed Feb 21 10:33:17 2018 +0100

    iOS, solved problem with -I for asm module
    
    Change-Id: I9e699eea04231eeeff4146657124ee4f0e68412d

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 5cc6b247126a..4c6d7ec95046 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -27,8 +27,9 @@ bridge_noopt_objects := cpp2uno except uno2cpp
 bridge_asm_objects := ios64_helper
 
 #HACK
-$(eval $(call gb_Library_use_custom_headers,$(gb_CPPU_ENV)_uno,\
-        bridges/source/cpp_uno/gcc3_ios \
+$(eval $(call gb_Library_set_include,$(gb_CPPU_ENV)_uno,\
+    $$(INCLUDE) \
+    -I $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios) \
 ))
 
 $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s: \