Merge
This commit is contained in:
commit
569c7fb353
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
# Base locations where bundles are located
|
# Base locations where bundles are located
|
||||||
slashjava=/java
|
slashjava=/java
|
||||||
drops.dir=${slashjava}/devtools/share/jdk7-drops
|
drops.dir=${slashjava}/devtools/share/jdk8-drops
|
||||||
|
|
||||||
# This is the JDK used to build and run the bootstrap version of javac.
|
# This is the JDK used to build and run the bootstrap version of javac.
|
||||||
# The bootstrap javac is used to compile both boostrap versions of the
|
# The bootstrap javac is used to compile both boostrap versions of the
|
||||||
|
@ -99,9 +99,9 @@ ifdef ALT_DROPS_DIR
|
|||||||
DROPS_DIR = $(ALT_DROPS_DIR)
|
DROPS_DIR = $(ALT_DROPS_DIR)
|
||||||
else
|
else
|
||||||
ifdef ALT_JDK_DEVTOOLS_DIR
|
ifdef ALT_JDK_DEVTOOLS_DIR
|
||||||
DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
|
DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
|
||||||
else
|
else
|
||||||
DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
|
DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user