Kaydet (Commit) a58c4445 authored tarafından Caolán McNamara's avatar Caolán McNamara

fix fuzzer build

Change-Id: I87933b78126ffbf29999f4d17b212df21560bdbd
Reviewed-on: https://gerrit.libreoffice.org/46080Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst a691cd7a
...@@ -3555,6 +3555,9 @@ $(call gb_LinkTarget_set_include,$(1),\ ...@@ -3555,6 +3555,9 @@ $(call gb_LinkTarget_set_include,$(1),\
) )
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ -lgpgmepp \ -L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ -lgpgmepp \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L$(call gb_UnpackedTarball_get_dir,gpgmepp)/src/.libs/ -lgpgme) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$$(GPG_ERROR_LIBS)) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$$(LIBASSUAN_LIBS)) \
) )
endef endef
......
...@@ -70,6 +70,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): ...@@ -70,6 +70,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
&& $(MAKE) \ && $(MAKE) \
$(if $(filter MACOSX,$(OS)),\ $(if $(filter MACOSX,$(OS)),\
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
......
...@@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): ...@@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
&& $(MAKE) \ && $(MAKE) \
$(if $(filter MACOSX,$(OS)),\ $(if $(filter MACOSX,$(OS)),\
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
......
...@@ -45,6 +45,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): ...@@ -45,6 +45,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build):
$(if $(filter MSC,$(COM)),--force_use_syscfg=true) \ $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
&& $(MAKE) \ && $(MAKE) \
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment