commit 34d27faa4aa332bdf06fa36fbf4e4136f8facba0
author Nick Wellnhofer <wellnhofer@aevum.de> Fri Feb 03 23:28:50 2017 +0100
committer Nick Wellnhofer <wellnhofer@aevum.de> Sat Feb 04 18:10:18 2017 +0100
tree 0deecb021b2c760df1adc57165a97ac490d290ee
parent d8e3d9377948cc9490a55519dfbcd67c2bc58162

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.

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 @@
 
 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 @@
     /* 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 @@
 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 @@
     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 @@
         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);