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 2015/07/25 15:32:02 UTC
[1/2] lucy-charmonizer git commit: Fix command_with_libpath on Windows
Repository: lucy-charmonizer
Updated Branches:
refs/heads/master 79216ae87 -> 4cb27bbbd
Fix command_with_libpath on Windows
Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/2a5a509d
Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/2a5a509d
Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/2a5a509d
Branch: refs/heads/master
Commit: 2a5a509dbf1dbf4aa4a41e98b6aeb2758274d53b
Parents: 79216ae
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sun Jul 12 11:45:37 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sun Jul 12 11:45:37 2015 +0200
----------------------------------------------------------------------
src/Charmonizer/Core/Make.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/2a5a509d/src/Charmonizer/Core/Make.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c
index 1063bf3..34a5364 100644
--- a/src/Charmonizer/Core/Make.c
+++ b/src/Charmonizer/Core/Make.c
@@ -709,7 +709,10 @@ chaz_MakeRule_add_command_with_libpath(chaz_MakeRule *rule,
path = chaz_Util_vjoin(";", args);
va_end(args);
- lib_command = chaz_Util_join("", "path ", path, ";%path% && ", command,
+ /* It's important to not add a space before `&&`. Otherwise, the
+ * space is added to the search path.
+ */
+ lib_command = chaz_Util_join("", "path ", path, ";%path%&& ", command,
NULL);
}
else {
[2/2] lucy-charmonizer git commit: Make chaz_MakeFile_override_cflags
return added rule
Posted by nw...@apache.org.
Make chaz_MakeFile_override_cflags return added rule
Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/4cb27bbb
Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/4cb27bbb
Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/4cb27bbb
Branch: refs/heads/master
Commit: 4cb27bbbd58b6fa74bfa6b0539d9bd80d2fedd99
Parents: 2a5a509
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Jul 25 15:31:28 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Jul 25 15:31:28 2015 +0200
----------------------------------------------------------------------
src/Charmonizer/Core/Make.c | 4 +++-
src/Charmonizer/Core/Make.h | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/4cb27bbb/src/Charmonizer/Core/Make.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c
index 34a5364..abc9a74 100644
--- a/src/Charmonizer/Core/Make.c
+++ b/src/Charmonizer/Core/Make.c
@@ -503,7 +503,7 @@ chaz_MakeFile_add_lemon_grammar(chaz_MakeFile *makefile,
return rule;
}
-void
+chaz_MakeRule*
chaz_MakeFile_override_cflags(chaz_MakeFile *makefile, const char *obj,
chaz_CFlags *cflags) {
const char *obj_ext = chaz_CC_obj_ext();
@@ -542,6 +542,8 @@ chaz_MakeFile_override_cflags(chaz_MakeFile *makefile, const char *obj,
free(command);
free(src);
+
+ return rule;
}
void
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/4cb27bbb/src/Charmonizer/Core/Make.h
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Make.h b/src/Charmonizer/Core/Make.h
index 50fc301..25e99ea 100644
--- a/src/Charmonizer/Core/Make.h
+++ b/src/Charmonizer/Core/Make.h
@@ -187,7 +187,7 @@ chaz_MakeFile_add_lemon_grammar(chaz_MakeFile *makefile,
* @param obj The object file.
* @param cflags Compiler flags.
*/
-void
+chaz_MakeRule*
chaz_MakeFile_override_cflags(chaz_MakeFile *makefile, const char *obj,
chaz_CFlags *cflags);