From 2d16f03ca44269d79a28f04884165bbbb6286ba5 Mon Sep 17 00:00:00 2001
From: aqua <aqua@iserlohn-fortress.net>
Date: Tue, 21 Feb 2023 17:54:34 +0200
Subject: Rename host and target tool names

- target tool prefix is ${ARCH}_
- host tool prefix is HOST_
---
 Makefile.config | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

(limited to 'Makefile.config')

diff --git a/Makefile.config b/Makefile.config
index b5a5ab3..0ad2a91 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -30,34 +30,38 @@ ARCH=i686
 
 # define compiler, linker, archiver and strip and their flags
 # FIXME: cpp threadsafe statics
-AS       := i686-elf-as
+${ARCH}_AS       := i686-elf-as
 
-CC       := i686-elf-gcc
-CCID     := $(shell ${CC} --version | head -n1)
-CFLAGS   := -Wall -Wextra -Wpedantic -Werror=shadow -Wconversion -fanalyzer -ffreestanding -std=gnu11 \
-	    -mgeneral-regs-only \
-            $(shell echo ${CONFIG_CFLAGS})
+${ARCH}_CC       := i686-elf-gcc
+${ARCH}_CCID     := $(shell ${${ARCH}_CC} --version | head -n1)
+${ARCH}_CFLAGS   := -Wall -Wextra -Wpedantic -Werror=shadow -Wconversion -fanalyzer -ffreestanding -std=gnu11 \
+		    -mgeneral-regs-only \
+		    $(shell echo ${CONFIG_CFLAGS})
 
-CXX      := i686-elf-g++
-CXXID    := $(shell ${CXX} --version | head -n1)
-CXXFLAGS := -Wall -Wextra -Wpedantic -Werror=shadow -Wconversion -ffreestanding -std=c++17 \
-	    -mgeneral-regs-only -fno-use-cxa-atexit -fno-threadsafe-statics -fno-exceptions -fno-rtti \
-            $(shell echo ${CONFIG_CXXFLAGS})
+${ARCH}_CXX      := i686-elf-g++
+${ARCH}_CXXID    := $(shell ${${ARCH}_CXX} --version | head -n1)
+${ARCH}_CXXFLAGS := -Wall -Wextra -Wpedantic -Werror=shadow -Wconversion -ffreestanding -std=c++17 \
+		    -mgeneral-regs-only -fno-use-cxa-atexit -fno-threadsafe-statics -fno-exceptions -fno-rtti \
+		    $(shell echo ${CONFIG_CXXFLAGS})
 
-LD       := i686-elf-ld
-LDID     := $(shell ${LD} --version | head -n1)
-LDFLAGS  := -static -nostdlib \
-            $(shell echo ${CONFIG_LDFLAGS})
+${ARCH}_LD       := i686-elf-ld
+${ARCH}_LDID     := $(shell ${${ARCH}_LD} --version | head -n1)
+${ARCH}_LDFLAGS  := -static -nostdlib \
+	            $(shell echo ${CONFIG_LDFLAGS})
 
-AR       := i686-elf-ar
-ARFLAGS  := -crus
+${ARCH}_AR       := i686-elf-ar
+${ARCH}_ARFLAGS  := -crus
 
-STRIP    := i686-elf-strip
+${ARCH}_STRIP    := i686-elf-strip
 
 # define compiler and flags for test targets
-TEST_CXX      := g++
-TEST_CXXFLAGS := -Wall -Wextra -Wpedantic -Werror=shadow -Wconversion -g -Og \
-		 $(shell pkg-config --cflags --libs gtest gtest_main gmock)
+HOST_CC       := gcc
+HOST_CFLAGS   := -Wall -Wextra -Wpedantic -Werror=shadow -Wconversion \
+		 ${CFLAGS}
+HOST_CXX      := g++
+HOST_CXXFLAGS := -Wall -Wextra -Wpedantic -Werror=shadow -Wconversion -g -Og \
+		 $(shell pkg-config --cflags --libs gtest gtest_main gmock) \
+		 ${CXXFLAGS}
 
 # emulator name and flags
 QEMU     := qemu-system-i386 -accel kvm -machine pc
-- 
cgit v1.2.1