Skip to content

Commit 18c27bc

Browse files
committed
Revert "Merge pull request #13029 from dra27/windows-zstd"
This reverts commit 3a176d7.
1 parent d38925d commit 18c27bc

File tree

2 files changed

+0
-133
lines changed

2 files changed

+0
-133
lines changed

configure

-98
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

-35
Original file line numberDiff line numberDiff line change
@@ -2234,41 +2234,6 @@ AS_IF([test x"$with_zstd" != "xno"],
22342234
[[#include <zstd.h>]])],
22352235
[zstd_status="zstd library not found"])]))
22362236

2237-
# When building the mingw-w64 port in Cygwin, it is very easy to have the
2238-
# library available, but not have the DLL in PATH. This then causes the build to
2239-
# fail as soon as ocamlrun is first executed. This check avoids automatically
2240-
# enabling zstd when the resulting executable doesn't actually work.
2241-
AS_CASE([$host],
2242-
[*-w64-mingw32*|*-pc-windows],
2243-
[AS_IF([test x"$build" = x"$host"],[
2244-
check_zstd_runs=true],[
2245-
AS_CASE([$build],
2246-
[*-pc-msys|*-pc-cygwin*],
2247-
[check_zstd_runs=true],
2248-
[check_zstd_runs=false])
2249-
])],
2250-
[check_zstd_runs=false])
2251-
2252-
AS_IF([test x"$zstd_status" = "xok"],[
2253-
AC_MSG_CHECKING([whether programs linked zstd can execute])
2254-
AS_IF([! $check_zstd_runs],[
2255-
AC_MSG_RESULT([skipped])],[
2256-
OCAML_CC_SAVE_VARIABLES
2257-
LIBS="$LIBS $zstd_libs"
2258-
CFLAGS="$CFLAGS $zstd_flags"
2259-
OCAML_RUN_IFELSE(
2260-
[AC_LANG_SOURCE([[
2261-
#include <zstd.h>
2262-
int main(void) {
2263-
return (ZSTD_versionNumber() == 0);
2264-
}
2265-
]])],
2266-
[AC_MSG_RESULT([yes])],
2267-
[AC_MSG_RESULT([no])
2268-
zstd_status="programs linked with zstd do not appear to be executable."],
2269-
[AC_MSG_RESULT([skipped])])
2270-
OCAML_CC_RESTORE_VARIABLES])])
2271-
22722237
AS_IF([test x"$zstd_status" = "xok"],
22732238
[AC_MSG_NOTICE([compressed compilation artefacts supported])
22742239
internal_cppflags="$internal_cppflags $zstd_flags"

0 commit comments

Comments
 (0)