diff options
| author | Andrew Waterman <andrew@sifive.com> | 2021-11-26 16:40:40 -0800 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2021-11-26 16:40:40 -0800 |
| commit | f5e5b653d99a2529310eca69b91a49aba02c62cd (patch) | |
| tree | 7863a012355782a69067d91e1a611ad70a7d082b /Makefile.in | |
| parent | 1a5b2d9dda8741e98444289135e0fbcb2c3f5740 (diff) | |
| download | spike-f5e5b653d99a2529310eca69b91a49aba02c62cd.zip spike-f5e5b653d99a2529310eca69b91a49aba02c62cd.tar.gz spike-f5e5b653d99a2529310eca69b91a49aba02c62cd.tar.bz2 | |
Fix link error on Mojave
1f58b4d869a47d2f95621512455d52eb7c3546d9 introduced a link error on my
Mojave machine, because making the Boost include path the highest-priority
one was forcing use of the system's libfdt.h. But the system's libfdt.h
unfortunately lacks the 'extern "C"' linkage modifier, causing link errors
when invoking FDT routines from C++ code.
Fix by making the Boost include path the lowest-priority one.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 9b1176c..f2f8278 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,7 +96,7 @@ VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled)) default-CFLAGS := -DPREFIX=\"$(prefix)\" -Wall -Wno-unused -Wno-nonportable-include-path -g -O2 -fPIC default-CXXFLAGS := $(default-CFLAGS) -std=c++11 -mcppbs-CPPFLAGS := @CPPFLAGS@ @BOOST_CPPFLAGS@ +mcppbs-CPPFLAGS := @CPPFLAGS@ mcppbs-CFLAGS := $(default-CFLAGS) @CFLAGS@ mcppbs-CXXFLAGS := $(default-CXXFLAGS) @CXXFLAGS@ @@ -111,7 +111,7 @@ all-cxx-flags := \ all-c-flags := \ $(mcppbs-CPPFLAGS) $(mcppbs-CFLAGS) $(CPPFLAGS) $(CFLAGS) -COMPILE := $(CXX) -MMD -MP $(all-cxx-flags) $(sprojs_include) +COMPILE := $(CXX) -MMD -MP $(all-cxx-flags) $(sprojs_include) @BOOST_CPPFLAGS@ COMPILE_C := $(CC) -MMD -MP $(all-c-flags) $(sprojs_include) # Linker |