Skip to content

[wasm] Remove USE_ZLIB=1 on windows, as we are already including the … #64628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radical merged 2 commits into from
Feb 1, 2022
Merged

[wasm] Remove USE_ZLIB=1 on windows, as we are already including the … #64628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d107593
[wasm] Remove USE_ZLIB=1 on windows, as we are already including the …
radical Feb 1, 2022
8403bcb
[wasm] Use zlib sources from repo instead of emscripten port
akoeplinger Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/mono/wasm/wasm.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@

<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
<_EmccFlags Include="@(_EmccCommonFlags)" />
<_EmccFlags Include="-s USE_ZLIB=1" />
</ItemGroup>

<WriteLinesToFile File="$(_EmccDefaultsRspPath)"
Expand Down
21 changes: 12 additions & 9 deletions src/native/libs/System.IO.Compression.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,19 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER)
append_extra_compression_libs(NATIVE_LIBS_EXTRA)

if (CLR_CMAKE_TARGET_BROWSER)
add_definitions(-s USE_ZLIB)
else ()
# Disable implicit fallthrough warning for Brotli
set(FLAGS -Wno-implicit-fallthrough)
include(${CLR_SRC_NATIVE_DIR}/external/zlib.cmake)
add_definitions(-DINTERNAL_ZLIB)
set(NATIVECOMPRESSION_SOURCES ${ZLIB_SOURCES} ${NATIVECOMPRESSION_SOURCES})
endif()

# Delete this supression once brotli is upgraded to vNext (current latest v1.0.9
# does not contain upstream fix: https://github.com/google/brotli/commit/0a3944c)
set(FLAGS "${FLAGS} -Wno-vla-parameter")
# Disable implicit fallthrough warning for Brotli
set(FLAGS -Wno-implicit-fallthrough)

set_source_files_properties(${NATIVECOMPRESSION_SOURCES} PROPERTIES COMPILE_FLAGS ${FLAGS})
endif ()
# Delete this supression once brotli is upgraded to vNext (current latest v1.0.9
# does not contain upstream fix: https://github.com/google/brotli/commit/0a3944c)
set(FLAGS "${FLAGS} -Wno-vla-parameter")

set_source_files_properties(${NATIVECOMPRESSION_SOURCES} PROPERTIES COMPILE_FLAGS ${FLAGS})

if (GEN_SHARED_LIB)
add_definitions(-DBROTLI_SHARED_COMPILATION)
Expand Down Expand Up @@ -88,6 +90,7 @@ else ()
include(${CLR_SRC_NATIVE_DIR}/external/zlib.cmake)
endif ()

add_definitions(-DINTERNAL_ZLIB)
set(NATIVECOMPRESSION_SOURCES ${ZLIB_SOURCES} ${NATIVECOMPRESSION_SOURCES})

if (GEN_SHARED_LIB)
Expand Down
6 changes: 4 additions & 2 deletions src/native/libs/System.IO.Compression.Native/pal_zlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
#include <stdlib.h>
#include "pal_zlib.h"

#ifdef _WIN32
#define c_static_assert(e) static_assert((e),"")
#ifdef INTERNAL_ZLIB
#ifdef _WIN32
#define c_static_assert(e) static_assert((e),"")
#endif
#include <external/zlib/zlib.h>
#else
#include "pal_utilities.h"
Expand Down