You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2014/07/24 13:59:46 UTC
git commit: Regenerate charmonizer.c to fix BSD make
Repository: lucy-clownfish
Updated Branches:
refs/heads/master 87328f042 -> 5b58deb50
Regenerate charmonizer.c to fix BSD make
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/5b58deb5
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/5b58deb5
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/5b58deb5
Branch: refs/heads/master
Commit: 5b58deb50b55c187c254efd36ccb5aa8b6130af5
Parents: 87328f0
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Thu Jul 24 13:55:49 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Thu Jul 24 13:55:49 2014 +0200
----------------------------------------------------------------------
compiler/common/charmonizer.c | 18 ++++++++----------
runtime/common/charmonizer.c | 18 ++++++++----------
2 files changed, 16 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5b58deb5/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index 812b77f..d139b23 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -4166,16 +4166,14 @@ chaz_MakeFile_write(chaz_MakeFile *makefile) {
S_write_rule(makefile->clean, out);
S_write_rule(makefile->distclean, out);
- if (chaz_Make.is_nmake) {
- /* Inference rule for .c files. */
- if (chaz_CC_msvc_version_num()) {
- fprintf(out, ".c.obj :\n");
- fprintf(out, "\t$(CC) /nologo $(CFLAGS) /c $< /Fo$@\n\n");
- }
- else {
- fprintf(out, ".c.o :\n");
- fprintf(out, "\t$(CC) $(CFLAGS) -c $< -o $@\n\n");
- }
+ /* Suffix rule for .c files. */
+ if (chaz_CC_msvc_version_num()) {
+ fprintf(out, ".c.obj :\n");
+ fprintf(out, "\t$(CC) /nologo $(CFLAGS) /c $< /Fo$@\n\n");
+ }
+ else {
+ fprintf(out, ".c.o :\n");
+ fprintf(out, "\t$(CC) $(CFLAGS) -c $< -o $@\n\n");
}
fclose(out);
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5b58deb5/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.c b/runtime/common/charmonizer.c
index b6ed036..e5577e8 100644
--- a/runtime/common/charmonizer.c
+++ b/runtime/common/charmonizer.c
@@ -4166,16 +4166,14 @@ chaz_MakeFile_write(chaz_MakeFile *makefile) {
S_write_rule(makefile->clean, out);
S_write_rule(makefile->distclean, out);
- if (chaz_Make.is_nmake) {
- /* Inference rule for .c files. */
- if (chaz_CC_msvc_version_num()) {
- fprintf(out, ".c.obj :\n");
- fprintf(out, "\t$(CC) /nologo $(CFLAGS) /c $< /Fo$@\n\n");
- }
- else {
- fprintf(out, ".c.o :\n");
- fprintf(out, "\t$(CC) $(CFLAGS) -c $< -o $@\n\n");
- }
+ /* Suffix rule for .c files. */
+ if (chaz_CC_msvc_version_num()) {
+ fprintf(out, ".c.obj :\n");
+ fprintf(out, "\t$(CC) /nologo $(CFLAGS) /c $< /Fo$@\n\n");
+ }
+ else {
+ fprintf(out, ".c.o :\n");
+ fprintf(out, "\t$(CC) $(CFLAGS) -c $< -o $@\n\n");
}
fclose(out);