From 200e37365bd32e993b58c43459c3a7f833a84717 Mon Sep 17 00:00:00 2001 From: Jonathan Currier Date: Sat, 31 Aug 2019 22:45:39 -0500 Subject: [PATCH] Force mboxd to always link with $(CC) Linking with CXX breaks building on toolchains without c++ support, even when you point CXX to CC. Therefore, force always link with CC (it should work even if c++ code is being linked in). --- Makefile.am | 3 +++ README.md | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index ac57ea2..980a092 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,9 @@ mboxd_SOURCES = \ transport_mbox.c \ windows.c \ mtd.c + +mboxd_LINK = $(LINK) + mboxd_LDFLAGS = $(LIBSYSTEMD_LIBS) mboxd_CFLAGS = $(LIBSYSTEMD_CFLAGS) diff --git a/README.md b/README.md index c986e0f..fb08e35 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,10 @@ The build system is a standard autotools setup. `bootstrap.sh` runs all the jobs necessary to initialise autotools. By default mboxd is configured and built _without_ the 'virtual PNOR' feature -discussed below. The virtual PNOR functionality is written in C++, and due to -some autotools clunkiness even if it is disabled mboxd will still be linked -with `CXX`. Point `CXX` to `cc` at configure time if you do not have a C++ -compiler for your target (`./configure CXX=cc`). +discussed below. The virtual PNOR functionality is written in C++, and in +prevous versions, due to some autotools clunkiness even if it is disabled mboxd +will still be linked with `CXX`. This is no longer true. mboxd always links +with $(CC). If you are hacking on the reference implementation it's recommended to run `bootstrap.sh` with the `dev` argument: -- 2.30.2