1.1 --- a/make/common/NativeCompilation.gmk Wed Apr 18 12:37:18 2018 -0700
1.2 +++ b/make/common/NativeCompilation.gmk Tue Apr 17 09:33:36 2018 -0700
1.3 @@ -43,6 +43,12 @@
1.4 ARCHIVING_MSG=
1.5 endif
1.6
1.7 +ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin)
1.8 + UNIX_PATH_PREFIX := /cygdrive
1.9 +else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys)
1.10 + UNIX_PATH_PREFIX :=
1.11 +endif
1.12 +
1.13 define add_native_source
1.14 # param 1 = BUILD_MYPACKAGE
1.15 # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
1.16 @@ -117,7 +123,7 @@
1.17 && $(SED) -e '/^Note: including file:/!d' \
1.18 -e 's|Note: including file: *||' \
1.19 -e 's|\\|/|g' \
1.20 - -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
1.21 + -e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \
1.22 -e '/$(subst /,\/,$(TOPDIR))/!d' \
1.23 -e 's|$$$$| \\|g' \
1.24 $$($1_$2_DEP).raw) > $$($1_$2_DEP)
