Index: boot/Makefile.build
===================================================================
--- boot/Makefile.build	(revision bd92e6d58d98c6e39be91bc9e1d2d04be71b5c04)
+++ boot/Makefile.build	(revision 7f881cd8e3ac707b5ae404c782b53844495e1a1e)
@@ -92,21 +92,12 @@
 	$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).in | grep -v "^\#" > $(LINK)
 
+%.o: %.s | depend
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+
 %.o: %.S | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
-endif
-
-%.o: %.s | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS)
 
 depend: $(PRE_DEPEND)
Index: boot/Makefile.common
===================================================================
--- boot/Makefile.common	(revision bd92e6d58d98c6e39be91bc9e1d2d04be71b5c04)
+++ boot/Makefile.common	(revision 7f881cd8e3ac707b5ae404c782b53844495e1a1e)
@@ -57,5 +57,11 @@
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
-JOBFILE = $(ROOT_PATH)/tools/jobfile.py
+ifeq ($(PRECHECK),y)
+	JOBFILE = $(TOOLS_PATH)/jobfile.py
+	# XXX: Do not change the order of arguments.
+	CC_JOB = $(JOBFILE) $(JOB) $(CC) $< -o $@
+else
+	CC_JOB = $(CC) $< -o $@
+endif
 
 DISTROOT = distroot
Index: kernel/Makefile
===================================================================
--- kernel/Makefile	(revision bd92e6d58d98c6e39be91bc9e1d2d04be71b5c04)
+++ kernel/Makefile	(revision 7f881cd8e3ac707b5ae404c782b53844495e1a1e)
@@ -59,9 +59,16 @@
 
 GENMAP = tools/genmap.py
-JOBFILE = $(ROOT_PATH)/tools/jobfile.py
 
 LINK = arch/$(KARCH)/_link.ld
 EMPTY_MAP = generic/src/debug/empty_map.o
 SIZEOK_MAP = generic/src/debug/sizeok_map.o
+
+ifeq ($(PRECHECK),y)
+	JOBFILE = $(ROOT_PATH)/tools/jobfile.py
+	# XXX: Do not change the order of arguments.
+	CC_JOB = $(JOBFILE) $(JOB) $(CC) $< -o $@
+else
+	CC_JOB = $(CC) $< -o $@
+endif
 
 .PHONY: all clean autogen_clean depend
@@ -407,20 +414,11 @@
 
 %.o: %.S | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c -o $@ $<
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.s | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__ -c -o $@ $<
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION)) -c -o $@ $<
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION))
 
 $(REAL_MAP).o: $(REAL_MAP).bin
Index: tools/jobfile.py
===================================================================
--- tools/jobfile.py	(revision bd92e6d58d98c6e39be91bc9e1d2d04be71b5c04)
+++ tools/jobfile.py	(revision 7f881cd8e3ac707b5ae404c782b53844495e1a1e)
@@ -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__':
Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision bd92e6d58d98c6e39be91bc9e1d2d04be71b5c04)
+++ uspace/Makefile.common	(revision 7f881cd8e3ac707b5ae404c782b53844495e1a1e)
@@ -272,5 +272,11 @@
 #
 
-JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
+ifeq ($(PRECHECK),y)
+	JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
+	# XXX: Do not change the order of arguments.
+	CC_JOB = $(JOBFILE) $(JOB) $(CC) $< -o $@
+else
+	CC_JOB = $(CC) $< -o $@
+endif
 
 ifeq ($(COMPILER),clang)
@@ -336,44 +342,23 @@
 
 %.o: %.S | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.s | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
 
 %.test.o: %.c | depend
-	$(CC) -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
 
 %.lo: %.S | depend
-	$(CC) -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.lo: %.s | depend
-	$(CC) -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.lo: %.c | depend
-	$(CC) -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
-endif
+	$(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
 
 depend: $(PRE_DEPEND)