solenv/inc/tg_compv.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit 2ae9c18c80c3bec0c52dc1b457ab667ced2172ee Author: Herbert Dürr <[email protected]> Date: Mon Mar 3 12:46:45 2014 +0000 #i124351# avoid "clang: no input file" build error messages which were caused by the build system getting the compiler version diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk index f8d7969..5585be8 100644 --- a/solenv/inc/tg_compv.mk +++ b/solenv/inc/tg_compv.mk @@ -35,9 +35,11 @@ CFLAGSVERSION=-dumpversion CFLAGSVERSION_CMD=-dumpversion CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk #CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1 $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk -.ENDIF - -.IF "$(COM)"=="MSC" +.ELIF "$(COM)"=="CLANG" +CFLAGSVERSION=--version +CFLAGSVERSION_CMD=--version | head -n1 | sed -e"s/.*version //" -e"s/ .*//" +CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -e"s/\.//" +.ELIF "$(COM)"=="MSC" CFLAGSVERSION= CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk CFLAGSNUMVERSION_CMD= $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
