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 2013/03/14 16:41:13 UTC
[lucy-commits] [2/7] git commit: refs/heads/master - Put extra link flags after
objects
Put extra link flags after objects
On some systems, libraries have to specified after objects when linking.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6e157f8f
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6e157f8f
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6e157f8f
Branch: refs/heads/master
Commit: 6e157f8f62ee3bf322fb04e3889ef69ef4980815
Parents: 4bb2af7
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Thu Mar 14 13:33:28 2013 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Thu Mar 14 13:42:59 2013 +0100
----------------------------------------------------------------------
charmonizer/src/Charmonizer/Core/Make.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/6e157f8f/charmonizer/src/Charmonizer/Core/Make.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/Make.c b/charmonizer/src/Charmonizer/Core/Make.c
index 8a8f149..9a44d27 100644
--- a/charmonizer/src/Charmonizer/Core/Make.c
+++ b/charmonizer/src/Charmonizer/Core/Make.c
@@ -258,13 +258,13 @@ chaz_MakeFile_add_exe(chaz_MakeFile *makefile, const char *exe,
size = strlen(pattern)
+ strlen(link)
+ strlen(link_flags)
- + strlen(extra_link_flags)
+ strlen(objects)
+ + strlen(extra_link_flags)
+ strlen(output_flag)
+ strlen(exe)
+ 50;
command = (char*)malloc(size);
- sprintf(command, pattern, link, link_flags, extra_link_flags, objects,
+ sprintf(command, pattern, link, link_flags, objects, extra_link_flags,
output_flag, exe);
chaz_MakeRule_add_command(rule, command);
@@ -292,14 +292,14 @@ chaz_MakeFile_add_shared_obj(chaz_MakeFile *makefile, const char *shared_obj,
+ strlen(link)
+ strlen(shobj_flags)
+ strlen(link_flags)
- + strlen(extra_link_flags)
+ strlen(objects)
+ + strlen(extra_link_flags)
+ strlen(output_flag)
+ strlen(shared_obj)
+ 50;
command = (char*)malloc(size);
- sprintf(command, pattern, link, shobj_flags, link_flags, extra_link_flags,
- objects, output_flag, shared_obj);
+ sprintf(command, pattern, link, shobj_flags, link_flags, objects,
+ extra_link_flags, output_flag, shared_obj);
chaz_MakeRule_add_command(rule, command);
chaz_MakeFile_add_to_cleanup(makefile, shared_obj);