Add cross-compilation support.

I.e. add HOSTCXX etc make variables, and use the host compiler when
compiling mconfig-gen.

diff --git a/configs/mconfig.Linux b/configs/mconfig.Linux
index d693cb08a9bb31e61650dd5a685bc44043104794..1d7363447fab138a1b061e3bc34224e8216e0d6b 100644 (file)
--- a/configs/mconfig.Linux
+++ b/configs/mconfig.Linux
@@ -11,6 +11,6 @@ SYSCONTROLSOCKET=/dev/dinitctl
 # the new ABI. See BUILD file for more information.
 CXX=g++
 CXXOPTS=-D_GLIBCXX_USE_CXX11_ABI=1 -std=c++11 -Os -Wall -fno-rtti -fno-plt -flto
-LDFLAGS=-flto
+LDFLAGS=-flto -Os
 BUILD_SHUTDOWN=yes
 SANITIZEOPTS=-fsanitize=address,undefined

diff --git a/src/Makefile b/src/Makefile
index 47726c29b4c8cdfbdc8cece7374ad60b2719c397..347a66dacce24d71d4a5fdfba334f23fa83aa231 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,9 @@
 include ../mconfig
 
+HOSTCXX ?= $(CXX)
+HOSTCXXFLAGS ?= $(CXXFLAGS)
+HOSTLDFLAGS ?= $(LDFLAGS)
+
 ifeq ($(BUILD_SHUTDOWN),yes)
   SHUTDOWN=shutdown
 endif
@@ -26,7 +30,7 @@ includes/mconfig.h: mconfig-gen
                $(if $(USE_UTMPX),USE_UTMPX=$(USE_UTMPX),) > includes/mconfig.h
 
 mconfig-gen: mconfig-gen.cc ../mconfig
-       $(CXX) $(CXXOPTS) -o mconfig-gen mconfig-gen.cc $(LDFLAGS)
+       $(HOSTCXX) $(HOSTCXXOPTS) -o mconfig-gen mconfig-gen.cc $(HOSTLDFLAGS)
 
 $(dinit_objects): includes/mconfig.h