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 2017/02/04 17:37:28 UTC
[9/9] lucy-charmonizer git commit: Set CC and LINK variables in
Makefile
Set CC and LINK variables in Makefile
Before, CC was set by Clownfish's and Lucy's charmonizer.main.
The LINK variable makes is easier to change the link command manually.
Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/34d27faa
Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/34d27faa
Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/34d27faa
Branch: refs/heads/master
Commit: 34d27faa4aa332bdf06fa36fbf4e4136f8facba0
Parents: d8e3d93
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Fri Feb 3 23:28:50 2017 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Feb 4 18:10:18 2017 +0100
----------------------------------------------------------------------
src/Charmonizer/Core/Make.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/34d27faa/src/Charmonizer/Core/Make.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c
index cebacd5..2ea2c7c 100644
--- a/src/Charmonizer/Core/Make.c
+++ b/src/Charmonizer/Core/Make.c
@@ -394,7 +394,6 @@ chaz_MakeFile_add_exe(chaz_MakeFile *self, const char *dir,
void
S_chaz_MakeFile_finish_exe(chaz_MakeFile *self, chaz_MakeBinary *binary) {
- const char *link = chaz_CC_link_command();
const char *link_flags_string;
char *command;
@@ -409,8 +408,8 @@ S_chaz_MakeFile_finish_exe(chaz_MakeFile *self, chaz_MakeBinary *binary) {
/* Objects in dollar var must come before flags since flags may
* contain libraries.
*/
- command = chaz_Util_join(" ", link, binary->dollar_var, link_flags_string,
- NULL);
+ command = chaz_Util_join(" ", "$(LINK)", binary->dollar_var,
+ link_flags_string, NULL);
chaz_MakeRule_add_command(binary->rule, command);
free(command);
}
@@ -446,7 +445,6 @@ chaz_MakeFile_add_shared_lib(chaz_MakeFile *self, const char *dir,
void
S_chaz_MakeFile_finish_shared_lib(chaz_MakeFile *self,
chaz_MakeBinary *binary) {
- const char *link = chaz_CC_link_command();
const char *link_flags_string;
int binfmt = chaz_CC_binary_format();
char *no_v_name
@@ -471,8 +469,8 @@ S_chaz_MakeFile_finish_shared_lib(chaz_MakeFile *self,
chaz_CFlags_set_link_output(binary->link_flags, "$@");
link_flags_string = chaz_CFlags_get_string(binary->link_flags);
- command = chaz_Util_join(" ", link, binary->dollar_var, link_flags_string,
- NULL);
+ command = chaz_Util_join(" ", "$(LINK)", binary->dollar_var,
+ link_flags_string, NULL);
chaz_MakeRule_add_command(binary->rule, command);
free(command);
@@ -656,6 +654,9 @@ chaz_MakeFile_write(chaz_MakeFile *self) {
fprintf(out, "SHELL = cmd\n");
}
+ fprintf(out, "CC = %s\n", chaz_CC_get_cc());
+ fprintf(out, "LINK = %s\n", chaz_CC_link_command());
+
for (i = 0; self->vars[i]; i++) {
chaz_MakeVar *var = self->vars[i];
fprintf(out, "%s = %s\n", var->name, var->value);