From f7930b3a1279922cf9e6e75e651fe9b5df247bc6 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal@nekernel.org>
Date: Tue, 2 Dec 2025 01:39:42 -0500
Subject: chore: source level tweaks and breaking API changes.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
---
 src/Tools/asm.cc              | 12 ++++++------
 src/Tools/cppdrv.cc           |  2 +-
 src/Tools/pef-amd64-cxxdrv.cc |  2 +-
 src/Tools/pef-arm64-cdrv.cc   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/Tools')

diff --git a/src/Tools/asm.cc b/src/Tools/asm.cc
index 37c7d01..c92705b 100644
--- a/src/Tools/asm.cc
+++ b/src/Tools/asm.cc
@@ -8,7 +8,7 @@
 /// @brief Assembler frontend.
 
 #include <CompilerKit/Config.h>
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 #include <cstring>
 #include <vector>
 
@@ -34,7 +34,7 @@ Int32 main(Int32 argc, Char const* argv[]) {
   Int32       asm_type          = kInvalidAssembler;
 
   for (size_t index_arg = 1; index_arg < argc; ++index_arg) {
-    if (strstr(argv[index_arg], "-asm:h")) {
+    if (strcmp(argv[index_arg], "-asm-h") == 0) {
       std::printf("asm: Frontend Assembler (64x0, power64, arm64, x64).\n");
       std::printf("asm: Version: %s, Release: %s.\n", kDistVersion, kDistRelease);
       std::printf(
@@ -45,13 +45,13 @@ Int32 main(Int32 argc, Char const* argv[]) {
           "Licensed under the Apache 2.0 license.\n");
 
       return 0;
-    } else if (strstr(argv[index_arg], "-asm:x64")) {
+    } else if (strcmp(argv[index_arg], "-asm-x64") == 0) {
       asm_type = kX64Assembler;
-    } else if (strstr(argv[index_arg], "-asm:aarch64")) {
+    } else if (strcmp(argv[index_arg], "-asm-aarch64") == 0) {
       asm_type = kARM64Assembler;
-    } else if (strstr(argv[index_arg], "-asm:64x0")) {
+    } else if (strcmp(argv[index_arg], "-asm-64x0") == 0) {
       asm_type = k64X0Assembler;
-    } else if (strstr(argv[index_arg], "-asm:power64")) {
+    } else if (strcmp(argv[index_arg], "-asm-power64") == 0) {
       asm_type = kPOWER64Assembler;
     } else {
       arg_vec_cstr.push_back(argv[index_arg]);
diff --git a/src/Tools/cppdrv.cc b/src/Tools/cppdrv.cc
index 9d42b15..c1f8fa2 100644
--- a/src/Tools/cppdrv.cc
+++ b/src/Tools/cppdrv.cc
@@ -9,7 +9,7 @@
 
 #include <CompilerKit/Config.h>
 #include <CompilerKit/ErrorID.h>
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 #include <cstring>
 #include <iostream>
 #include <vector>
diff --git a/src/Tools/pef-amd64-cxxdrv.cc b/src/Tools/pef-amd64-cxxdrv.cc
index 8aedba5..eff8c05 100644
--- a/src/Tools/pef-amd64-cxxdrv.cc
+++ b/src/Tools/pef-amd64-cxxdrv.cc
@@ -9,7 +9,7 @@
 
 #include <CompilerKit/Config.h>
 #include <CompilerKit/ErrorID.h>
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 #include <CompilerKit/utils/CompilerUtils.h>
 #include <CompilerKit/utils/DylibHelpers.h>
 
diff --git a/src/Tools/pef-arm64-cdrv.cc b/src/Tools/pef-arm64-cdrv.cc
index d07d9bd..316eb23 100644
--- a/src/Tools/pef-arm64-cdrv.cc
+++ b/src/Tools/pef-arm64-cdrv.cc
@@ -9,7 +9,7 @@
 
 #include <CompilerKit/Config.h>
 #include <CompilerKit/ErrorID.h>
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 #include <CompilerKit/utils/CompilerUtils.h>
 #include <CompilerKit/utils/DylibHelpers.h>
 
-- 
cgit v1.2.3