Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8136397: Build should recognise .cc file extension
authorprr
Mon, 14 Sep 2015 10:56:55 -0700
changeset 32568 fc5205c29b31
parent 32567 18cbcab4b68f
child 32569 a63d10163947
8136397: Build should recognise .cc file extension Reviewed-by: ihse
make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions 
--- a/make/common/NativeCompilation.gmk	Mon Sep 14 09:33:37 2015 -0700
+++ b/make/common/NativeCompilation.gmk	Mon Sep 14 10:56:55 2015 -0700
@@ -102,7 +102,7 @@
 ################################################################################
 
 # Extensions of files handled by this macro.
-NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.m %.mm
+NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.cc %.m %.mm
 
 # Replaces native source extensions with the object file extension in a string.
 # Param 1: the string containing source file names with extensions
@@ -167,7 +167,7 @@
     $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
     $1_$2_COMP=$(AS)
     $1_$2_DEP_FLAG:=
-  else ifneq (,$$(filter %.cpp,$2)$$(filter %.mm,$2))
+  else ifneq (,$$(filter %.cpp,$2)$$(filter %.cc,$2)$$(filter %.mm,$2))
     # Compile as a C++ or Objective-C++ file
     $1_$2_FLAGS=$(CFLAGS_CCACHE) $6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
     $1_$2_COMP=$7
jdk-sandbox