cross-compile: fix generic "cc", "c++" cross-compile support

when PATH include /usr/lib/distcc

also fix a strict aliasing issue

2 files changed, 5 insertions, 1 deletions

diff --git a/src/compile.c b/src/compile.c
index e45fba5..8f90151 100644
--- a/src/compile.c
+++ b/src/compile.c
@@ -491,7 +491,9 @@ static void dcc_rewrite_generic_compiler(char **argv)
     if ((st.st_mode & S_IFMT) == S_IFLNK) {
         /* this is a Debian thing. Fedora just has /usr/bin/cc -> gcc */
         if (strcmp(linkbuf, cpp ? "/etc/alternatives/c++" : "/etc/alternatives/cc") == 0) {
-            ssz = readlinkat(dir, linkbuf, linkbuf, sizeof(linkbuf) - 1);
+            char *intermediate_link = strdupa(linkbuf);
+
+            ssz = readlinkat(dir, intermediate_link, linkbuf, sizeof(linkbuf) - 1);
             linkbuf[ssz] = '\0';
         }
     }
diff --git a/src/util.c b/src/util.c
index 27f8620..274a599 100644
--- a/src/util.c
+++ b/src/util.c
@@ -585,6 +585,8 @@ int dcc_which(const char *command, char **out)
     if (!path)
         return -ENOENT;
     do {
+        if (strstr(path, "distcc"))
+            continue;
         /* emulate strchrnul() */
         t = strchr(path, ':');
         if (!t)