diff options
| -rw-r--r-- | RepositoryExternal.mk | 5 | ||||
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 16 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 2 |
3 files changed, 5 insertions, 18 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0592dea01200..a556c3dc378e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4131,16 +4131,19 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_add_libs,$(1),$(BZIP2_LIBS)) endef + gb_ExternalProject__use_bzip2 := else # !SYSTEM_BZIP2 define gb_LinkTarget__use_bzip2 -$(call gb_LinkTarget_use_external_project,$(1),bzip2) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,bzip2) \ $$(INCLUDE) \ ) +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,bzip2) -lbz2 \ +) endef define gb_ExternalProject__use_bzip2 diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index 30713c486556..a4c4f9563108 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -26,22 +26,6 @@ $(eval $(call gb_Executable_add_libs,updater,\ -lICE \ )) -ifeq ($(OS),MACOSX) -$(eval $(call gb_Executable_set_include,updater,\ - -lgtk \ -)) -$(eval $(call gb_Exectuable_add_libs,updater,\ - -lpthread \ -)) -else ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_set_include,updater,\ - -lgtk \ -)) -$(eval $(call gb_Exectuable_add_libs,updater,\ - -lpthread \ -)) -endif - $(eval $(call gb_Executable_add_cxxflags,updater,\ $$(GTK3_CFLAGS) \ )) diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index 8de9cc1e0898..998a3109bf3f 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -143,7 +143,7 @@ static bool sUseHardLinks = true; // declare it here to avoid including that entire header file. #define BZ2_CRC32TABLE_UNDECLARED -#if MOZ_IS_GCC +#if defined(HAVE_GCC_VISIBILITY_FEATURE) extern "C" __attribute__((visibility("default"))) unsigned int BZ2_crc32Table[256]; #undef BZ2_CRC32TABLE_UNDECLARED #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) |