Merge remote-tracking branch 'origin/upstream' into oi/hipster

Andrzej Szeszo

2013-06-04 453bf5a3004107204e1858532a38b3e703e32995

 components/antlr/Makefile

@@ -20,7 +20,7 @@
#

#
# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#

include ../../make-rules/shared-macros.mk
@@ -62,6 +62,8 @@

COMPONENT_TEST_TARGETS = test

ASLR_MODE = $(ASLR_ENABLE)

# common targets
build:          $(BUILD_32)