From 1a0e604510c1cbc6b1e330c74231d01afbc03213 Mon Sep 17 00:00:00 2001
From: Mirek Fidler <mirek.fidler@gmail.com>
Date: Sat, 3 Jun 2023 01:54:48 +0200
Subject: [PATCH] uppbox: MakePosixIntall: umks32 NOSSL flag; cosmetics

---
 uppbox/MakePosixInstall/Main.cpp | 2 +-
 uppsrc/Core/Ops.h                | 1 -
 uppsrc/umk/UppHub.cpp            | 2 --
 uppsrc/umk/umk.upp               | 8 +++++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/uppbox/MakePosixInstall/Main.cpp b/uppbox/MakePosixInstall/Main.cpp
index a0f67e3ef..34c3bef64 100644
--- a/uppbox/MakePosixInstall/Main.cpp
+++ b/uppbox/MakePosixInstall/Main.cpp
@@ -127,7 +127,7 @@ CONSOLE_APP_MAIN
 #endif
 
 #ifdef PLATFORM_LINUX
-	Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC32 " OPTS  + release + "/umks32");
+	Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC32 " OPTS + "+NOSSL " + release + "/umks32");
 #endif
 
 	Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC +NOMM -rvsM");
diff --git a/uppsrc/Core/Ops.h b/uppsrc/Core/Ops.h
index 536732bf9..ef40bbad2 100644
--- a/uppsrc/Core/Ops.h
+++ b/uppsrc/Core/Ops.h
@@ -262,7 +262,6 @@ byte addc64(uint64& result, const uint64& value, byte carry) {
 force_inline
 byte addc64(uint64& r, uint64 a, byte carry)
 {
-	uint64_t r1 = r;
 	r += a + carry;
 	return carry ? r <= a : r < a;
 }
diff --git a/uppsrc/umk/UppHub.cpp b/uppsrc/umk/UppHub.cpp
index a1d771d4d..985f6a7dd 100644
--- a/uppsrc/umk/UppHub.cpp
+++ b/uppsrc/umk/UppHub.cpp
@@ -151,7 +151,6 @@ void UppHubDlg::Install(const Index<String>& ii_)
 
 bool UppHubAuto(const String& main)
 {
-	bool noprompt = false;
 	Index<String> pmissing;
 	for(;;) {
 		Workspace wspc;
@@ -176,7 +175,6 @@ bool UppHubAuto(const String& main)
 
 		if(found.GetCount() == missing.GetCount() && missing != pmissing) {
 			dlg.Install(found);
-			noprompt = true;
 			pmissing = clone(missing);
 			continue;
 		}
diff --git a/uppsrc/umk/umk.upp b/uppsrc/umk/umk.upp
index c9745b0c4..55061173e 100644
--- a/uppsrc/umk/umk.upp
+++ b/uppsrc/umk/umk.upp
@@ -1,8 +1,9 @@
 description "Commandline U++ package/assembly builder\377";
 
 uses
-	ide\Builders,
-	Core/SSL;
+	ide\Builders;
+
+uses(!NOSSL) Core/SSL;
 
 file
 	umake.h,
@@ -15,5 +16,6 @@ file
 
 mainconfig
 	"" = "",
-	"" = "NOMM";
+	"" = "NOMM",
+	"" = "NOSSL";