build system: Fixed CCACHE/DISTCC/SYSROOT space issues

- The preprocessor must be passed to ecp/ecc with -cpp "$(CPP)"
- The definitions of CC/CPP/CXX must not contain any spaces
- CCACHE_COMPILE/DISTCC_COMPILE must contain their own extra space at the end if set, with $(space), otherwise must be empty string

diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile
index d5345db..2469ed4 100755 (executable)
--- a/compiler/ecc/Makefile
+++ b/compiler/ecc/Makefile
@@ -94,7 +94,7 @@ ECFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile
index e7f5b46..ac27826 100755 (executable)
--- a/compiler/ecp/Makefile
+++ b/compiler/ecp/Makefile
@@ -94,7 +94,7 @@ ECFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile
index 6e1f749..d64a6c1 100755 (executable)
--- a/compiler/ecs/Makefile
+++ b/compiler/ecs/Makefile
@@ -94,7 +94,7 @@ ECFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index 6db96a4..c1b55f6 100755 (executable)
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -133,7 +133,7 @@ ECFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/crossplatform.mk b/crossplatform.mk
index cc1922d..83ac02c 100755 (executable)
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -139,13 +139,13 @@ LP := $(if $(WINDOWS_TARGET),$(if $(STATIC_LIBRARY_TARGET),lib,),lib)
 
 # SUPER TOOLS
 ifdef CCACHE
-   CCACHE_COMPILE := ccache
+   CCACHE_COMPILE := ccache$(space)
 ifdef DISTCC
-   DISTCC_COMPILE := distcc
+   DISTCC_COMPILE := distcc$(space)
 endif
 else
 ifdef DISTCC
-   DISTCC_COMPILE := distcc
+   DISTCC_COMPILE := distcc$(space)
 endif
 endif
 

diff --git a/deps/freetype-2.3.12/Makefile b/deps/freetype-2.3.12/Makefile
index dcfc7aa..88a2ddb 100755 (executable)
--- a/deps/freetype-2.3.12/Makefile
+++ b/deps/freetype-2.3.12/Makefile
@@ -157,7 +157,7 @@ CFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS +=

diff --git a/deps/jpeg-6b/Makefile b/deps/jpeg-6b/Makefile
index 8ec4838..9a0db72 100755 (executable)
--- a/deps/jpeg-6b/Makefile
+++ b/deps/jpeg-6b/Makefile
@@ -160,7 +160,7 @@ CFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS +=

diff --git a/deps/libffi-3.0.11/Makefile b/deps/libffi-3.0.11/Makefile
index 602e55b..c0e8e42 100755 (executable)
--- a/deps/libffi-3.0.11/Makefile
+++ b/deps/libffi-3.0.11/Makefile
@@ -75,7 +75,7 @@ CFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS +=

diff --git a/deps/libpng-1.4.0/Makefile b/deps/libpng-1.4.0/Makefile
index 83dce21..174c20d 100755 (executable)
--- a/deps/libpng-1.4.0/Makefile
+++ b/deps/libpng-1.4.0/Makefile
@@ -92,7 +92,7 @@ CFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS +=

diff --git a/deps/libungif-4.1.1/Makefile b/deps/libungif-4.1.1/Makefile
index fe018da..616fb97 100755 (executable)
--- a/deps/libungif-4.1.1/Makefile
+++ b/deps/libungif-4.1.1/Makefile
@@ -66,7 +66,7 @@ CFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)

diff --git a/deps/zlib/Makefile b/deps/zlib/Makefile
index 81ae7c4..6ef9d6a 100755 (executable)
--- a/deps/zlib/Makefile
+++ b/deps/zlib/Makefile
@@ -84,7 +84,7 @@ CFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS +=

diff --git a/documentor/Makefile b/documentor/Makefile
index 5a00d0a..2327b88 100755 (executable)
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -103,7 +103,7 @@ ECFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index b369783..883f560 100755 (executable)
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -95,7 +95,7 @@ ECFLAGS += \
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index 9ba18a9..541b6a5 100755 (executable)
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -176,7 +176,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/ecere/Makefile b/ecere/Makefile
index 92cc82b..4902a34 100755 (executable)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -507,7 +507,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)

diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM
index 0a37df5..5c09cf7 100755 (executable)
--- a/ecere/Makefile.ecereCOM
+++ b/ecere/Makefile.ecereCOM
@@ -130,7 +130,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)

diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla
index 7d3e1fa..45d6345 100755 (executable)
--- a/ecere/Makefile.vanilla
+++ b/ecere/Makefile.vanilla
@@ -464,7 +464,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)

diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index 1b7ccf6..6067fd5 100755 (executable)
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -145,7 +145,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index d7964d6..a176bbf 100755 (executable)
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -154,7 +154,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index 686d4fb..2bf381a 100755 (executable)
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -115,7 +115,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/epj2make/Makefile b/epj2make/Makefile
index fd1f3d3..b747421 100755 (executable)
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -109,7 +109,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/ide/Makefile b/ide/Makefile
index 6181ce7..c979984 100755 (executable)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -231,7 +231,7 @@ endif
 
 
 
-CECFLAGS += -cpp $(CPP)
+CECFLAGS += "-cpp $(CPP)"
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 61b64bc..5f1a165 100755 (executable)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2047,9 +2047,9 @@ private:
             }
 
             //f.Printf("SHELL := %s\n", "sh"/*compiler.shellCommand*/); // is this really needed?
-            f.Printf("CPP := $(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.cppCommand);
-            f.Printf("CC := $(CCACHE_COMPILE) $(DISTCC_COMPILE) $(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.ccCommand);
-            f.Printf("CXX := $(CCACHE_COMPILE) $(DISTCC_COMPILE) $(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.cxxCommand);
+            f.Printf("CPP := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.cppCommand);
+            f.Printf("CC := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.ccCommand);
+            f.Printf("CXX := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.cxxCommand);
             f.Printf("ECP := %s\n", compiler.ecpCommand);
             f.Printf("ECC := %s\n", compiler.eccCommand);
             f.Printf("ECS := %s$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)\n", compiler.ecsCommand);
@@ -2521,7 +2521,7 @@ private:
          f.Puts("\n");
          f.Puts("\n");
 
-         f.Puts("CECFLAGS += -cpp $(CPP)");
+         f.Puts("CECFLAGS += -cpp \"$(CPP)\"");
          f.Puts("\n");
          f.Puts("\n");
 

diff --git a/include.mk b/include.mk
index a6791f0..2744141 100644 (file)
--- a/include.mk
+++ b/include.mk
@@ -1,6 +1,6 @@
 # TOOLCHAIN
-export CC      = $(CCACHE_COMPILE) $(DISTCC_COMPILE) $(GCC_PREFIX)gcc$(_SYSROOT)
-export CPP     = $(CCACHE_COMPILE) $(DISTCC_COMPILE) $(GCC_PREFIX)cpp$(_SYSROOT)
+export CC      = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)
+export CPP     = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)cpp$(_SYSROOT)
 export ECP     = ecp
 export ECC     = ecc
 export ECS     = %s$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)