commit 11932834edba6919c6d03605f7aa48c3f6a8036f parent 2c899ad6dae851ee1c0212f74293cfbd18977be6 Author: Roberto E. Vargas Caballero <k0ga@shike2.com> Date: Sat, 18 Jan 2020 17:50:25 +0100 [build] Make config directories regular Diffstat:
25 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/config/config/amd64-darwin.mk b/config/conf/amd64-darwin.mk diff --git a/config/conf/amd64-dragonfly.mk b/config/conf/amd64-dragonfly.mk @@ -0,0 +1,3 @@ +include $(PROJECTDIR)/config/conf/amd64-posix.mk + +SYS = dragonfly diff --git a/config/conf/amd64-linux.mk b/config/conf/amd64-linux.mk @@ -0,0 +1,3 @@ +include $(PROJECTDIR)/config/conf/amd64-posix.mk + +SYS = linux diff --git a/config/conf/amd64-netbsd.mk b/config/conf/amd64-netbsd.mk @@ -0,0 +1,3 @@ +include $(PROJECTDIR)/config/conf/amd64-posix.mk + +SYS = netbsd diff --git a/config/conf/amd64-openbsd.mk b/config/conf/amd64-openbsd.mk @@ -0,0 +1,3 @@ +include $(PROJECTDIR)/config/conf/amd64-posix.mk + +SYS = openbsd diff --git a/config/config/amd64-posix.mk b/config/conf/amd64-posix.mk diff --git a/config/conf/arm32-linux.mk b/config/conf/arm32-linux.mk @@ -0,0 +1,3 @@ +include $(PROJECTDIR)/config/conf/arm32-posix.mk + +SYS = linux diff --git a/config/config/arm32-posix.mk b/config/conf/arm32-posix.mk diff --git a/config/conf/arm64-linux.mk b/config/conf/arm64-linux.mk @@ -0,0 +1,3 @@ +include $(PROJECTDIR)/config/conf/arm64-linux.mk + +SYS = linux diff --git a/config/config/arm64-posix.mk b/config/conf/arm64-posix.mk diff --git a/config/config/amd64-dragonfly.mk b/config/config/amd64-dragonfly.mk @@ -1,3 +0,0 @@ -include $(PROJECTDIR)/config/config/amd64-posix.mk - -SYS = dragonfly diff --git a/config/config/amd64-linux.mk b/config/config/amd64-linux.mk @@ -1,3 +0,0 @@ -include $(PROJECTDIR)/config/config/amd64-posix.mk - -SYS = linux diff --git a/config/config/amd64-netbsd.mk b/config/config/amd64-netbsd.mk @@ -1,3 +0,0 @@ -include $(PROJECTDIR)/config/config/amd64-posix.mk - -SYS = netbsd diff --git a/config/config/amd64-openbsd.mk b/config/config/amd64-openbsd.mk @@ -1,3 +0,0 @@ -include $(PROJECTDIR)/config/config/amd64-posix.mk - -SYS = openbsd diff --git a/config/config/arm32-linux.mk b/config/config/arm32-linux.mk @@ -1,3 +0,0 @@ -include $(PROJECTDIR)/config/config/arm32-posix.mk - -SYS = linux diff --git a/config/config/arm64-linux.mk b/config/config/arm64-linux.mk @@ -1,3 +0,0 @@ -include $(PROJECTDIR)/config/config/arm64-linux.mk - -SYS = linux diff --git a/config/tool/clang.mk b/config/tool/clang.mk @@ -0,0 +1,8 @@ +include $(PROJECTDIR)/config/tool/gnu.mk + +COMP = clang +ASM = clang +TOOLASFLAGS = -c +LINKER = ld.lld +OBJCOPY = llvm-objcopy +OBJDUMP = llvm-objdump diff --git a/config/tool/gnu-darwin.mk b/config/tool/gnu-darwin.mk @@ -0,0 +1,3 @@ +include $(PROJECTDIR)/config/tool/gnu.mk + +RANLIBFLAGS = -c diff --git a/config/toolchain/gnu.mk b/config/tool/gnu.mk diff --git a/config/tool/pcc.mk b/config/tool/pcc.mk @@ -0,0 +1,3 @@ +include $(PROJECTDIR)/config/tool/gnu.mk + +COMP = pcc diff --git a/config/toolchain/unix.mk b/config/tool/unix.mk diff --git a/config/toolchain/clang.mk b/config/toolchain/clang.mk @@ -1,8 +0,0 @@ -include $(PROJECTDIR)/config/toolchain/gnu.mk - -COMP = clang -ASM = clang -TOOLASFLAGS = -c -LINKER = ld.lld -OBJCOPY = llvm-objcopy -OBJDUMP = llvm-objdump diff --git a/config/toolchain/gnu-darwin.mk b/config/toolchain/gnu-darwin.mk @@ -1,3 +0,0 @@ -include $(PROJECTDIR)/config/toolchain/gnu.mk - -RANLIBFLAGS = -c diff --git a/config/toolchain/pcc.mk b/config/toolchain/pcc.mk @@ -1,3 +0,0 @@ -include $(PROJECTDIR)/config/toolchain/gnu.mk - -COMP = pcc diff --git a/scripts/rules.mk b/scripts/rules.mk @@ -1,8 +1,8 @@ CONF=amd64-linux TOOL=unix HOST=unix -include $(PROJECTDIR)/config/config/$(CONF).mk -include $(PROJECTDIR)/config/toolchain/$(TOOL).mk +include $(PROJECTDIR)/config/conf/$(CONF).mk +include $(PROJECTDIR)/config/tool/$(TOOL).mk include $(PROJECTDIR)/config/host/$(HOST).mk LIBDIR = $(PROJECTDIR)/lib/scc