Index: tools/jobfile.py
===================================================================
--- tools/jobfile.py	(revision 28f4adbc5088d8d67ea408f56eb3b35838031e6a)
+++ tools/jobfile.py	(revision cfe485248470eaa3e68e053d375e4c11a7b486e9)
@@ -38,5 +38,5 @@
 def usage(prname):
 	"Print usage syntax"
-	print(prname + " <JOBFILE> <SOURCE> <TARGET> <TOOL> <CATEGORY> [OPTIONS ...]")
+	print(prname + " <JOBFILE> <CC> <INPUT> -o <OUTPUT> [CC_ARGUMENTS ...]")
 
 def main():
@@ -46,10 +46,23 @@
 	
 	jobfname = sys.argv[1]
-	srcfname = sys.argv[2]
-	tgtfname = sys.argv[3]
-	toolname = sys.argv[4]
-	category = sys.argv[5]
+	ccname = sys.argv[2]
+	srcfname = sys.argv[3]
+	assert(not srcfname.startswith("-"))
+	assert(sys.argv[4] == "-o")
+	tgtfname = sys.argv[5]
+	options = " ".join(sys.argv[6:])
 	cwd = os.getcwd()
-	options = " ".join(sys.argv[6:])
+	
+	if srcfname.endswith(".c"):
+		toolname = "cc"
+		category = "core"
+	
+	if srcfname.endswith(".s"):
+		toolname = "as"
+		category = "asm"
+	
+	if srcfname.endswith(".S"):
+		toolname = "as"
+		category = "asm/preproc"
 	
 	jobfile = open(jobfname, "a")
@@ -58,4 +71,7 @@
 	fcntl.lockf(jobfile, fcntl.LOCK_UN)
 	jobfile.close()
+	
+	# Run the compiler proper.
+	os.execvp(ccname, sys.argv[2:])
 
 if __name__ == '__main__':