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 14:15:45 UTC
[1/2] git commit: Create suffix rule for all make variants
Repository: lucy-charmonizer
Updated Branches:
refs/heads/master a636d73cf -> 9cc154147
Create suffix rule for all make variants
Hopefully fixes BSD make.
Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/3eef827c
Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/3eef827c
Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/3eef827c
Branch: refs/heads/master
Commit: 3eef827ce2a937e74663e35ff8ab6489ab0e2c08
Parents: a636d73
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Thu Jul 24 13:50:20 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Thu Jul 24 13:50:20 2014 +0200
----------------------------------------------------------------------
src/Charmonizer/Core/Make.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/3eef827c/src/Charmonizer/Core/Make.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c
index 4d4bfde..ef385c7 100644
--- a/src/Charmonizer/Core/Make.c
+++ b/src/Charmonizer/Core/Make.c
@@ -482,16 +482,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);
[2/2] git commit: Fix shared library cflags
Posted by nw...@apache.org.
Fix shared library cflags
Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/9cc15414
Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/9cc15414
Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/9cc15414
Branch: refs/heads/master
Commit: 9cc154147916948a5a63775ef2829ad3e7985cb8
Parents: 3eef827
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Thu Jul 24 14:07:14 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Thu Jul 24 14:07:14 2014 +0200
----------------------------------------------------------------------
src/Charmonizer/Core/CFlags.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/9cc15414/src/Charmonizer/Core/CFlags.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/CFlags.c b/src/Charmonizer/Core/CFlags.c
index 9d0b151..91a7c68 100644
--- a/src/Charmonizer/Core/CFlags.c
+++ b/src/Charmonizer/Core/CFlags.c
@@ -196,7 +196,7 @@ chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
string = "/MD";
}
- else if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+ else if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
const char *shlib_ext = chaz_OS_shared_lib_ext();
if (strcmp(shlib_ext, ".dylib") == 0) {
string = "-fno-common";