lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] git commit: refs/heads/master - Fix test target on ELF systems
Date Mon, 17 Feb 2014 14:20:53 GMT
Repository: lucy
Updated Branches:
  refs/heads/master ee72117ff -> 51765b1f0


Fix test target on ELF systems

Fix a mistake in the generated Makefile when --clownfish-prefix is used.


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/51765b1f
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/51765b1f
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/51765b1f

Branch: refs/heads/master
Commit: 51765b1f091a13e8848c706903c3049970fe537d
Parents: ee72117
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Mon Feb 17 15:17:22 2014 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Mon Feb 17 15:17:22 2014 +0100

----------------------------------------------------------------------
 common/charmonizer.c    | 4 ++--
 common/charmonizer.main | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/51765b1f/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 0c0aed7..eb23236 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -7350,8 +7350,8 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args,
     if (strcmp(chaz_OS_shared_lib_ext(), ".so") == 0) {
         if (cfish_lib) {
             test_command
-                = chaz_Util_join(" ", "LD_LIBRARY_PATH=.:", cfish_lib,
-                                 ":$$LD_LIBRARY_PATH", test_lucy_exe, NULL);
+                = chaz_Util_join("", "LD_LIBRARY_PATH=.:", cfish_lib,
+                                 ":$$LD_LIBRARY_PATH ", test_lucy_exe, NULL);
         }
         else {
             test_command

http://git-wip-us.apache.org/repos/asf/lucy/blob/51765b1f/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/common/charmonizer.main b/common/charmonizer.main
index cc29e3d..e5e0334 100644
--- a/common/charmonizer.main
+++ b/common/charmonizer.main
@@ -356,8 +356,8 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args,
     if (strcmp(chaz_OS_shared_lib_ext(), ".so") == 0) {
         if (cfish_lib) {
             test_command
-                = chaz_Util_join(" ", "LD_LIBRARY_PATH=.:", cfish_lib,
-                                 ":$$LD_LIBRARY_PATH", test_lucy_exe, NULL);
+                = chaz_Util_join("", "LD_LIBRARY_PATH=.:", cfish_lib,
+                                 ":$$LD_LIBRARY_PATH ", test_lucy_exe, NULL);
         }
         else {
             test_command


Mime
View raw message