diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 01:34:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 01:34:27 +0200 |
| commit | bfaea05b711ff3e204429ce9bd26c5fe63b0b687 (patch) | |
| tree | 7c17d88657c0eed6531e316c260d8735013f0f75 /solenv/gbuild/platform | |
| parent | b7d8ca8af95ac23f19cf1b63d1720cb0dd561bce (diff) | |
gbuild: gb_Helper_extend_ld_path was rather broken...
Change-Id: I03b2d8590fada4709f2223dcd05760bf2fddb196
Diffstat (limited to 'solenv/gbuild/platform')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index c74785402025..3f9600a76221 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -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)" -# $(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 -$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir)) +$(gb_Helper_set_ld_path):$(1) endef # Convert path to file URL. diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 03e65ad2c370..0389eedafdb1 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -279,7 +279,7 @@ endef # CppunitTest class 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_ilibfilename = $(gb_CppunitTest_get_filename) |