From bf4fb452dcf9d8a51186fc98277f92ddf6c958cc Mon Sep 17 00:00:00 2001 From: Slice Date: Fri, 15 Sep 2023 19:50:48 +0300 Subject: [PATCH] make the utility to be universal from 10.13 upto now Signed-off-by: Slice --- CloverPackage/utils/nvram/Makefile | 4 ++-- CloverPackage/utils/nvram/nvram2.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CloverPackage/utils/nvram/Makefile b/CloverPackage/utils/nvram/Makefile index 2b53efa6a..8bade1b11 100644 --- a/CloverPackage/utils/nvram/Makefile +++ b/CloverPackage/utils/nvram/Makefile @@ -14,8 +14,8 @@ PROG := $(addprefix $(UTILSDIR)/, $(PROGRAM)) all: $(PROG) $(PROG): $(SRC) - @echo "\t[CXX] $(PROGRAM)" - @cc -o $(PROGRAM) $(PROGRAM).c -framework CoreFoundation -framework IOKit -Wall >/dev/null + @echo "\t[CLANG] $(PROGRAM)" + @clang -o $(PROGRAM) $(PROGRAM).c -framework CoreFoundation -framework IOKit -mmacosx-version-min=10.13 >/dev/null @mv $(PROGRAM) $(UTILSDIR) install-local: $(PROG) diff --git a/CloverPackage/utils/nvram/nvram2.c b/CloverPackage/utils/nvram/nvram2.c index b35a3df7a..6f6a8d5f1 100644 --- a/CloverPackage/utils/nvram/nvram2.c +++ b/CloverPackage/utils/nvram/nvram2.c @@ -20,7 +20,7 @@ * @APPLE_LICENSE_HEADER_END@ */ /* -cc -o nvram nvram.c -framework CoreFoundation -framework IOKit -Wall +clang nvram2.c -o nvram3 -framework CoreFoundation -framework IOKit -mmacosx-version-min=10.13 */ // https://github.com/apple-oss-distributions/system_cmds/blob/13d383ddb305dc1672243e5384ba18b58949cc2c/nvram.tproj/nvram.c @@ -121,11 +121,11 @@ int main(int argc, char **argv) int argcount = 0; -#if defined(MAC_OS_VERSION_12_0) - result = IOMainPort(bootstrap_port, &mainPort); -#else +//#if defined(MAC_OS_VERSION_12_0) +// result = IOMainPort(bootstrap_port, &mainPort); +//#else result = IOMasterPort(bootstrap_port, &mainPort); -#endif +//#endif if (result != KERN_SUCCESS) { errx(1, "Error getting the IOMainPort: %s", mach_error_string(result));