Author: hdu
Date: Mon Mar 3 12:46:45 2014
New Revision: 1573547
URL: http://svn.apache.org/r1573547
Log:
#i124351# avoid "clang: no input file" build error messages
which were caused by the build system getting the compiler version
Modified:
openoffice/trunk/main/solenv/inc/tg_compv.mk
Modified: openoffice/trunk/main/solenv/inc/tg_compv.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_compv.mk?rev=1573547&r1=1573546&r2=1573547&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/tg_compv.mk (original)
+++ openoffice/trunk/main/solenv/inc/tg_compv.mk Mon Mar 3 12:46:45 2014
@@ -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
