Merge
This commit is contained in:
commit
601eefbfc5
@ -2,3 +2,4 @@ cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d jdk7-b24
|
|||||||
cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
|
cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
|
||||||
9410f77cc30c604d1caf7c9fe3a57fa19e1acbe8 jdk7-b26
|
9410f77cc30c604d1caf7c9fe3a57fa19e1acbe8 jdk7-b26
|
||||||
11b4dc9f2be3523ef989a0db8459eb56b3045c3a jdk7-b27
|
11b4dc9f2be3523ef989a0db8459eb56b3045c3a jdk7-b27
|
||||||
|
56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28
|
||||||
|
@ -225,7 +225,10 @@ COMMON_BUILD_ARGUMENTS = \
|
|||||||
JDK_MKTG_VERSION=$(JDK_MKTG_VERSION) \
|
JDK_MKTG_VERSION=$(JDK_MKTG_VERSION) \
|
||||||
JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) \
|
JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) \
|
||||||
JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) \
|
JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) \
|
||||||
JDK_MICRO_VERSION=$(JDK_MICRO_VERSION)
|
JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \
|
||||||
|
PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
|
||||||
|
PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
|
||||||
|
PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION)
|
||||||
|
|
||||||
ifdef ARCH_DATA_MODEL
|
ifdef ARCH_DATA_MODEL
|
||||||
COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
|
COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user