hare

commit f791939459dcdbfe769e0c00be7a6e3b530f2d74
parent 786bc69f83d902972b4b9dfb520679a746f1a544
Author: Drew DeVault <sir@cmpwn.com>
Date:   Thu, 18 Mar 2021 15:31:33 -0400

os::exec: disambiguate files

Diffstat:
M
gen-stdlib
 | 
4
++--
R
os/exec/cmd+linux.ha -> os/exec/exec+linux.ha
 | 
0

M
stdlib.mk
 | 
8
++++----

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gen-stdlib b/gen-stdlib
@@ -382,9 +382,9 @@ os_exec() {
 	printf '# os::exec\n'
 	gen_srcs os::exec \
 		'$(PLATFORM).ha' \
-		types.ha \
+		'exec$(PLATFORM).ha' \
 		'process$(PLATFORM).ha' \
-		'cmd$(PLATFORM).ha' \
+		types.ha \
 		cmd.ha
 	gen_ssa os::exec os strings fmt bytes path
 }
diff --git a/os/exec/cmd+linux.ha b/os/exec/exec+linux.ha
diff --git a/stdlib.mk b/stdlib.mk
@@ -479,9 +479,9 @@ $(HARECACHE)/os/os.ssa: $(stdlib_os_srcs) $(stdlib_rt) $(stdlib_io) $(stdlib_str
 # os::exec
 stdlib_os_exec_srcs= \
 	$(STDLIB)/os/exec/$(PLATFORM).ha \
-	$(STDLIB)/os/exec/types.ha \
+	$(STDLIB)/os/exec/exec$(PLATFORM).ha \
 	$(STDLIB)/os/exec/process$(PLATFORM).ha \
-	$(STDLIB)/os/exec/cmd$(PLATFORM).ha \
+	$(STDLIB)/os/exec/types.ha \
 	$(STDLIB)/os/exec/cmd.ha
 
 $(HARECACHE)/os/exec/os_exec.ssa: $(stdlib_os_exec_srcs) $(stdlib_rt) $(stdlib_os) $(stdlib_strings) $(stdlib_fmt) $(stdlib_bytes) $(stdlib_path)
@@ -1093,9 +1093,9 @@ $(TESTCACHE)/os/os.ssa: $(testlib_os_srcs) $(testlib_rt) $(testlib_io) $(testlib
 # os::exec
 testlib_os_exec_srcs= \
 	$(STDLIB)/os/exec/$(PLATFORM).ha \
-	$(STDLIB)/os/exec/types.ha \
+	$(STDLIB)/os/exec/exec$(PLATFORM).ha \
 	$(STDLIB)/os/exec/process$(PLATFORM).ha \
-	$(STDLIB)/os/exec/cmd$(PLATFORM).ha \
+	$(STDLIB)/os/exec/types.ha \
 	$(STDLIB)/os/exec/cmd.ha
 
 $(TESTCACHE)/os/exec/os_exec.ssa: $(testlib_os_exec_srcs) $(testlib_rt) $(testlib_os) $(testlib_strings) $(testlib_fmt) $(testlib_bytes) $(testlib_path)