Description: Pass @CXX@ into Makefile.in for fixing cross-satsfiablity problem Do not use "uname -s" in Makefile.in -- this is bad for cross builds. Rather propagate the variable in configure.ac Author: Nilesh Patra Last-Update: 2021-03-11 --- a/Makefile.in +++ b/Makefile.in @@ -1,12 +1,7 @@ -CXXFLAGS += -O3 -std=c++14 -Isrc -I@capnp@/include -I@mathinc@ +CXX = @CXX@ +CXXFLAGS += -O3 -std=c++14 -Isrc -I@capnp@/include -I@mathinc@ @DARWIN_CXXFLAGS@ CPPFLAGS += @amcppflags@ -UNAME_S=$(shell uname -s) - -ifeq ($(UNAME_S),Darwin) - CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ -endif - SOURCES=\ src/mash/Command.cpp \ src/mash/CommandBounds.cpp \ --- a/configure.ac +++ b/configure.ac @@ -76,4 +76,14 @@ AC_SUBST(capnp, $with_capnp) +case ${host} in + *-*-darwin*) + DARWIN_CXXFLAGS="-mmacosx-version-min=10.7 -stdlib=libc++" + ;; + *) + DARWIN_CXXFLAGS="" + ;; +esac +AC_SUBST(DARWIN_CXXFLAGS) + AC_OUTPUT(Makefile)