From 78713364aabc8e801c2f02b48cbadd8e91101f80 Mon Sep 17 00:00:00 2001 From: Aleksey Tomin Date: Tue, 7 Sep 2021 09:38:26 +0400 Subject: [PATCH] Support new Darwin platform prefix GitOrigin-RevId: 953e9a6932d94e4f483b76ff658b10f785ab041e --- .../util/src/com/intellij/openapi/util/io/FileSystemUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java index f233ed559089..03c7ed72ad7c 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java @@ -288,11 +288,12 @@ public final class FileSystemUtil { else if ("linux-ppc".equals(Platform.RESOURCE_PREFIX)) myOffsets = LNX_PPC32; else if ("linux-ppc64le".equals(Platform.RESOURCE_PREFIX)) myOffsets = LNX_PPC64; else if ("darwin".equals(Platform.RESOURCE_PREFIX)) myOffsets = BSD_64; + else if ("darwin-x86-64".equals(Platform.RESOURCE_PREFIX)) myOffsets = BSD_64; else if ("freebsd-x86".equals(Platform.RESOURCE_PREFIX)) myOffsets = SystemInfo.isOsVersionAtLeast("12") ? BSD_32_12 : BSD_32; else if ("freebsd-x86-64".equals(Platform.RESOURCE_PREFIX)) myOffsets = SystemInfo.isOsVersionAtLeast("12") ? BSD_64_12 : BSD_64; else if ("sunos-x86".equals(Platform.RESOURCE_PREFIX)) myOffsets = SUN_OS_32; else if ("sunos-x86-64".equals(Platform.RESOURCE_PREFIX)) myOffsets = SUN_OS_64; - else throw new IllegalStateException("Unsupported OS/arch: " + SystemInfo.OS_NAME + "/" + SystemInfo.OS_ARCH); + else throw new IllegalStateException("Unsupported OS/arch: " + Platform.RESOURCE_PREFIX); Map options = Collections.singletonMap(Library.OPTION_STRING_ENCODING, CharsetToolkit.getPlatformCharset().name()); NativeLibrary lib = NativeLibrary.getInstance("c", options);