RFR: 8136397: Build should recognise .cc file extension
Phil Race
philip.race at oracle.com
Fri Sep 11 16:24:10 UTC 2015
https://bugs.openjdk.java.net/browse/JDK-8136397
I have code under a JEP which will be merged into JDK 9 at some
point which uses C++ code in .cc files and I have had to maintain
a patch to get the JDK build to recognise these.
I'd like to get this patch into JDK 9 ahead of the files that need it
so that I don't have to deal with the merges anymore.
I did do a full jprt build of all platforms to confirm it is harmless ..
-phil.
diff -r 57f3134853ec make/common/NativeCompilation.gmk
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -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
More information about the build-dev
mailing list