diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2012-07-22 18:47:26 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 21:30:26 -0700 |
commit | 1015cc4225542ba69cf1627a743978f304a29c71 (patch) | |
tree | ef396e6789d04f7dcfba2888594113a289ff03ca | |
parent | d0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff) | |
download | git-1015cc4225542ba69cf1627a743978f304a29c71.tar.gz git-1015cc4225542ba69cf1627a743978f304a29c71.tar.xz |
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.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2116,7 +2116,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 |