Skip to contentSkip to conversation

Makefile: fix location of listing produced by "make subdir/foo.s"

PATCH In review Jonathan Nieder 2 participants 2 messages Jun 15, 2016 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: fix location of listing produced by "make subdir/foo.s"

When I invoke "make block-sha1/sha1.s", 'make' runs $(CC) -S without specifying where it should put its output and the output ends up in ./sha1.s. Confusing.

Add an -o option to the .s rule to fix this. We were already doing that for most compiler invocations but had forgotten it for the assembler listings.

---
Hi,

This patch is from below the scissors at
http://thread.gmane.org/gmane.comp.version-control.git/201434/focus=201485

I think it's a good change, but as usual it's nice if someone else takes a look at it and gives it a sanity check. If it seems sane, I'd be happy to see it applied. What do you think?

Thanks,
Jonathan

 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 285c660e..8bfa19cd 100644
@@ -2263,7 +2263,7 @@ $(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs)
 endif
 
 %.s: %.c GIT-CFLAGS FORCE
-	$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+	$(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
 
 ifdef USE_COMPUTED_HEADER_DEPENDENCIES
 # Take advantage of gcc's on-the-fly dependency generation
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 15 lines · Jonathan Nieder

When I invoke "make block-sha1/sha1.s", 'make' runs $(CC) -S without specifying where it should put its output and the output ends up in ./sha1.s. Confusing.

Add an -o option to the .s rule to fix this. We were already doing that for most compiler invocations but had forgotten it for the assembler listings.

---
Hi,

This patch is from below the scissors at
http://thread.gmane.org/gmane.comp.version-control.git/201434/focus=201485

Quoted 6 lines

I think it's a good change, but as usual it's nice if someone else takes a look at it and gives it a sanity check. If it seems sane, I'd be happy to see it applied. What do you think?

Thanks,
Jonathan

Yeah, I think it is a sensible thing to do.

Quoted 16 lines
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 285c660e..8bfa19cd 100644
@@ -2263,7 +2263,7 @@ $(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs)
 endif
 
 %.s: %.c GIT-CFLAGS FORCE
-	$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+	$(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
 
 ifdef USE_COMPUTED_HEADER_DEPENDENCIES
 # Take advantage of gcc's on-the-fly dependency generation