ref: 73b180769110ca05065017952173233ad8bb1c34
parent: bf2b631c10be44df6ca87c9b7e7fb279a9a4d4ec
author: Roberto E. Vargas Caballero <[email protected]>
date: Sat Jan 18 12:50:25 EST 2020
[build] Make config directories regular
--- /dev/null
+++ b/config/conf/amd64-darwin.mk
@@ -1,0 +1,4 @@
+ARCH = amd64
+SYS = darwin
+ABI = amd64-darwin
+O = 6d
--- /dev/null
+++ b/config/conf/amd64-dragonfly.mk
@@ -1,0 +1,3 @@
+include $(PROJECTDIR)/config/conf/amd64-posix.mk
+
+SYS = dragonfly
--- /dev/null
+++ b/config/conf/amd64-linux.mk
@@ -1,0 +1,3 @@
+include $(PROJECTDIR)/config/conf/amd64-posix.mk
+
+SYS = linux
--- /dev/null
+++ b/config/conf/amd64-netbsd.mk
@@ -1,0 +1,3 @@
+include $(PROJECTDIR)/config/conf/amd64-posix.mk
+
+SYS = netbsd
--- /dev/null
+++ b/config/conf/amd64-openbsd.mk
@@ -1,0 +1,3 @@
+include $(PROJECTDIR)/config/conf/amd64-posix.mk
+
+SYS = openbsd
--- /dev/null
+++ b/config/conf/amd64-posix.mk
@@ -1,0 +1,3 @@
+ARCH = amd64
+ABI = amd64-posix
+O = 6
--- /dev/null
+++ b/config/conf/arm32-linux.mk
@@ -1,0 +1,3 @@
+include $(PROJECTDIR)/config/conf/arm32-posix.mk
+
+SYS = linux
--- /dev/null
+++ b/config/conf/arm32-posix.mk
@@ -1,0 +1,3 @@
+ABI = arm32-posix
+ARCH = arm32
+O = 5
--- /dev/null
+++ b/config/conf/arm64-linux.mk
@@ -1,0 +1,3 @@
+include $(PROJECTDIR)/config/conf/arm64-linux.mk
+
+SYS = linux
--- /dev/null
+++ b/config/conf/arm64-posix.mk
@@ -1,0 +1,3 @@
+ARCH = arm64
+ABI = arm64-posix
+O = 6
--- a/config/config/amd64-darwin.mk
+++ /dev/null
@@ -1,4 +1,0 @@
-ARCH = amd64
-SYS = darwin
-ABI = amd64-darwin
-O = 6d
--- a/config/config/amd64-dragonfly.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-include $(PROJECTDIR)/config/config/amd64-posix.mk
-
-SYS = dragonfly
--- a/config/config/amd64-linux.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-include $(PROJECTDIR)/config/config/amd64-posix.mk
-
-SYS = linux
--- a/config/config/amd64-netbsd.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-include $(PROJECTDIR)/config/config/amd64-posix.mk
-
-SYS = netbsd
--- a/config/config/amd64-openbsd.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-include $(PROJECTDIR)/config/config/amd64-posix.mk
-
-SYS = openbsd
--- a/config/config/amd64-posix.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-ARCH = amd64
-ABI = amd64-posix
-O = 6
--- a/config/config/arm32-linux.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-include $(PROJECTDIR)/config/config/arm32-posix.mk
-
-SYS = linux
--- a/config/config/arm32-posix.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-ABI = arm32-posix
-ARCH = arm32
-O = 5
--- a/config/config/arm64-linux.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-include $(PROJECTDIR)/config/config/arm64-linux.mk
-
-SYS = linux
--- a/config/config/arm64-posix.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-ARCH = arm64
-ABI = arm64-posix
-O = 6
--- /dev/null
+++ b/config/tool/clang.mk
@@ -1,0 +1,8 @@
+include $(PROJECTDIR)/config/tool/gnu.mk
+
+COMP = clang
+ASM = clang
+TOOLASFLAGS = -c
+LINKER = ld.lld
+OBJCOPY = llvm-objcopy
+OBJDUMP = llvm-objdump
--- /dev/null
+++ b/config/tool/gnu-darwin.mk
@@ -1,0 +1,3 @@
+include $(PROJECTDIR)/config/tool/gnu.mk
+
+RANLIBFLAGS = -c
--- /dev/null
+++ b/config/tool/gnu.mk
@@ -1,0 +1,12 @@
+TOOLCFLAGS = -std=c99
+
+COMP = gcc
+ASM = as
+LINKER = ld
+RANLIB = ranlib
+ARCHIVE = ar
+
+ARCHIVEFLAGS = -U
+NOPIE_CFLAGS = -nopie
+NOPIE_LDFLAGS = -nopie
+TOOLCFLAGS = -std=c99
--- /dev/null
+++ b/config/tool/pcc.mk
@@ -1,0 +1,3 @@
+include $(PROJECTDIR)/config/tool/gnu.mk
+
+COMP = pcc
--- /dev/null
+++ b/config/tool/unix.mk
@@ -1,0 +1,5 @@
+COMP = c99
+ASM = as
+LINKER = ld
+RANLIB = ranlib
+ARCHIVE = ar
--- a/config/toolchain/clang.mk
+++ /dev/null
@@ -1,8 +1,0 @@
-include $(PROJECTDIR)/config/toolchain/gnu.mk
-
-COMP = clang
-ASM = clang
-TOOLASFLAGS = -c
-LINKER = ld.lld
-OBJCOPY = llvm-objcopy
-OBJDUMP = llvm-objdump
--- a/config/toolchain/gnu-darwin.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-include $(PROJECTDIR)/config/toolchain/gnu.mk
-
-RANLIBFLAGS = -c
--- a/config/toolchain/gnu.mk
+++ /dev/null
@@ -1,12 +1,0 @@
-TOOLCFLAGS = -std=c99
-
-COMP = gcc
-ASM = as
-LINKER = ld
-RANLIB = ranlib
-ARCHIVE = ar
-
-ARCHIVEFLAGS = -U
-NOPIE_CFLAGS = -nopie
-NOPIE_LDFLAGS = -nopie
-TOOLCFLAGS = -std=c99
--- a/config/toolchain/pcc.mk
+++ /dev/null
@@ -1,3 +1,0 @@
-include $(PROJECTDIR)/config/toolchain/gnu.mk
-
-COMP = pcc
--- a/config/toolchain/unix.mk
+++ /dev/null
@@ -1,5 +1,0 @@
-COMP = c99
-ASM = as
-LINKER = ld
-RANLIB = ranlib
-ARCHIVE = ar
--- 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