From de6ea0d1aec101133e6dc9630d2c06ebf5d39189 Mon Sep 17 00:00:00 2001
From: data-man <dataman@tutanota.com>
Date: Thu, 30 Sep 2021 04:27:06 +0500
Subject: [PATCH] Better support LLD 14+

---
 CMakeLists.txt          | 6 ------
 wrapper/src/wrapper.cpp | 6 +++++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index faee687f7..426d6dde5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,9 +62,6 @@ find_library(LLD_ELF NAMES lldELF.a liblldELF.a PATHS ${LLVM_LIBRARY_DIRS})
 find_library(LLD_DRIVER NAMES lldDriver.a liblldDriver.a PATHS ${LLVM_LIBRARY_DIRS})
 find_library(LLD_READER_WRITER NAMES lldReaderWriter.a liblldReaderWriter.a PATHS ${LLVM_LIBRARY_DIRS})
 find_library(LLD_MACHO NAMES lldMachO.a liblldMachO.a PATHS ${LLVM_LIBRARY_DIRS})
-if("${LLVM_PACKAGE_VERSION}" VERSION_GREATER 13)
-    find_library(LLD_MACHOOLD NAMES lldMachOOld.a liblldMachOOld.a PATHS ${LLVM_LIBRARY_DIRS})
-endif()
 find_library(LLD_YAML NAMES lldYAML.a liblldYAML.a PATHS ${LLVM_LIBRARY_DIRS})
 
 set(lld_libs
@@ -79,9 +76,6 @@ set(lld_libs
         ${LLD_YAML}
         ${LLD_CORE}
         )
-if("${LLVM_PACKAGE_VERSION}" VERSION_GREATER 13)
-    list(APPEND lld_libs ${LLD_MACHOOLD})
-endif()
 add_library(c3c_wrappers STATIC wrapper/src/wrapper.cpp)
 
 add_executable(c3c
diff --git a/wrapper/src/wrapper.cpp b/wrapper/src/wrapper.cpp
index fcfadea4a..9c48d6e2c 100644
--- a/wrapper/src/wrapper.cpp
+++ b/wrapper/src/wrapper.cpp
@@ -57,7 +57,11 @@ static bool llvm_link(ObjFormat format, const char **args, int arg_count, const
 			if (lld::elf::link(arg_vector, false, output, output_err)) return true;
 			break;
 		case MACHO:
-			if (lld::mach_o::link(arg_vector, false, output, output_err)) return true;
+			#if LLVM_VERSION_MAJOR > 13
+				if (lld::macho::link(arg_vector, false, output, output_err)) return true;
+			#else
+				if (lld::mach_o::link(arg_vector, false, output, output_err)) return true;
+			#endif
 			break;
 		case WASM:
 			if (lld::wasm::link(arg_vector, false, output, output_err)) return true;