From f549dc8f9d3b9a5c2498d36555a66216904b5e43 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 16 Mar 2011 17:07:11 +0200 Subject: Use realpath to avoid -I options containing symlinks on Cygwin --- tools/Executable_mkunroll.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/Executable_mkunroll.mk') diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index 7dbb613c7865..16cc39fd991d 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -29,9 +29,9 @@ $(eval $(call gb_Executable_Executable,mkunroll)) $(eval $(call gb_Executable_set_include,mkunroll,\ $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ + -I$(realpath $(SRCDIR)/tools/inc) \ + -I$(realpath $(SRCDIR)/tools/inc/pch) \ + -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) $(eval $(call gb_Executable_set_cxxflags,mkunroll,\ -- cgit From bd7533cc013fb0d5cbd1c649e5a7500597584baa Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 16 Apr 2011 15:50:35 +0200 Subject: introduce toolshelpers static lib to avoid duplicate linking errors --- tools/Executable_mkunroll.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tools/Executable_mkunroll.mk') diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index 16cc39fd991d..fb3662c1740a 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -46,14 +46,12 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ $(gb_STDLIBS) \ )) -# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial - $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/addexes2/mkfilt \ - tools/bootstrp/appdef \ - tools/bootstrp/cppdep \ - tools/bootstrp/inimgr \ - tools/bootstrp/prj \ +)) + +$(eval $(call gb_Executable_add_linked_static_libs,rscdep,\ + toolshelpers \ )) # vim: set noet sw=4 ts=4: -- cgit From 87328b9331d17413f2815770b7184e76c8cd84d6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 23 May 2011 00:26:23 +0300 Subject: Rename mkunroll source file and folder to meaningful names --- tools/Executable_mkunroll.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/Executable_mkunroll.mk') diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index fb3662c1740a..3aa74bc160ea 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ )) $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ - tools/bootstrp/addexes2/mkfilt \ + tools/bootstrp/mkunroll/mkunroll \ )) $(eval $(call gb_Executable_add_linked_static_libs,rscdep,\ -- cgit