3 files changed, 9 insertions, 2 deletions
diff --git a/tiff/contrib/addtiffo/CMakeLists.txt b/tiff/contrib/addtiffo/CMakeLists.txt
index b7482635..45e733cd 100644
--- a/tiff/contrib/addtiffo/CMakeLists.txt
+++ b/tiff/contrib/addtiffo/CMakeLists.txt
@@ -32,3 +32,9 @@ include_directories(${PROJECT_SOURCE_DIR}/libtiff
 
 add_executable(addtiffo addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h)
 target_link_libraries(addtiffo tiff port)
+
+if(WEBP_SUPPORT AND EMSCRIPTEN)
+  # Emscripten is pretty finnicky about linker flags.
+  # It needs --shared-memory if and only if atomics or bulk-memory is used.
+  target_link_options(addtiffo PUBLIC "-Wl,--shared-memory")
+endif()
diff --git a/tiff/contrib/addtiffo/Makefile.in b/tiff/contrib/addtiffo/Makefile.in
index abe4c027..31dc815c 100644
--- a/tiff/contrib/addtiffo/Makefile.in
+++ b/tiff/contrib/addtiffo/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/tiff/contrib/addtiffo/tif_ovrcache.c b/tiff/contrib/addtiffo/tif_ovrcache.c
index 67a88120..ac500ab4 100644
--- a/tiff/contrib/addtiffo/tif_ovrcache.c
+++ b/tiff/contrib/addtiffo/tif_ovrcache.c
@@ -166,6 +166,7 @@ static void TIFFWriteOvrRow( TIFFOvrCache * psCache )
 /* -------------------------------------------------------------------- */
     nBaseDirOffset = TIFFCurrentDirOffset( psCache->hTIFF );
     nRet = TIFFSetSubDirectory( psCache->hTIFF, psCache->nDirOffset );
+    (void) nRet;
     assert( nRet == 1 );
 
 /* -------------------------------------------------------------------- */