mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: gb_Helper_extend_ld_path was rather broken...

Browse Source 
Change-Id: I03b2d8590fada4709f2223dcd05760bf2fddb196
This commit is contained in:
Michael Stahl
2013-10-24 01:34:05 +02:00
parent b7d8ca8af9
commit bfaea05b71
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
solenv/gbuild/platform/com_GCC_defs.mk
View File

@@ -187,9 +187,9 @@ endif
gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)" gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)"
# $(1): list of directory pathnames to append at the end of the ld path # $(1): list of : separated directory pathnames to append to the ld path
define gb_Helper_extend_ld_path define gb_Helper_extend_ld_path
$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir)) $(gb_Helper_set_ld_path):$(1)
endef endef
# Convert path to file URL. # Convert path to file URL.

2
solenv/gbuild/platform/macosx.mk
View File

@@ -279,7 +279,7 @@ endef
# CppunitTest class # CppunitTest class
gb_CppunitTest_CPPTESTPRECOMMAND := \ gb_CppunitTest_CPPTESTPRECOMMAND := \
$(call gb_Helper_extend_ld_path,$(gb_Library_DLLDIR) $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs) $(call gb_Helper_extend_ld_path,$(gb_Library_DLLDIR):$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
gb_CppunitTest_get_filename = libtest_$(1).dylib gb_CppunitTest_get_filename = libtest_$(1).dylib
gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename) gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)