Mercurial > vanilla
changeset 1116:3a40c84f9253
gnu/make: use CC/CXX from build as default
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 20 Sep 2019 20:33:00 +0200 |
parents | 297b5eef115e |
children | af9e47ff06b8 |
files | gnu/make/make.sh gnu/make/patch-default.patch |
diffstat | 2 files changed, 26 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/gnu/make/make.sh Fri Sep 20 21:05:00 2019 +0200 +++ b/gnu/make/make.sh Fri Sep 20 20:33:00 2019 +0200 @@ -27,8 +27,6 @@ : ${CBUILD:=$(uname -m)-linux-musl} : ${CC:=clang} : ${CFLAGS:=-O2} -: ${CXX:=clang++} -: ${CXXFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} : ${GUILE:=no} @@ -54,10 +52,19 @@ tar xvf $PKGNAME-$PKGVERSION.tar.gz cd $PKGNAME-$PKGVERSION + # Change default CC/CXX/OBJC for a better compatibility. + patch -p0 < ../patch-default.patch + + case $CC in + "gcc") CXX=g++ ;; + "clang") CXX=clang++ ;; + esac + + sed -i -e "s|@CC@|$CC|" default.c + sed -i -e "s|@CXX@|$CXX|" default.c + CC="$CC" \ CFLAGS="$CFLAGS" \ - CXX="$CXX" \ - CXXFLAGS="$CXXFLAGS" \ LDFLAGS="$LDFLAGS" \ LIBS="$LIBS" \ ./configure \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnu/make/patch-default.patch Fri Sep 20 20:33:00 2019 +0200 @@ -0,0 +1,15 @@ +--- default.c.orig 2019-09-20 14:59:27.355416896 +0200 ++++ default.c 2019-09-20 15:00:13.339418309 +0200 +@@ -529,9 +529,9 @@ + # endif /* __MSDOS__ */ + "OBJC", "gcc", + #else +- "CC", "cc", +- "CXX", "g++", +- "OBJC", "cc", ++ "CC", "@CC@", ++ "CXX", "@CXX@", ++ "OBJC", "@CC@", + #endif + + /* This expands to $(CO) $(COFLAGS) $< $@ if $@ does not exist,