Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make-rules/shared-macros.mk
changeset 58 d8024c042a00
parent 53 e398cb2c4b45
child 59 7500d63edb42 
--- a/make-rules/shared-macros.mk	Wed Jan 05 13:27:53 2011 -0800
+++ b/make-rules/shared-macros.mk	Fri Jan 14 13:12:28 2011 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 PATH=/usr/bin:/usr/gnu/bin
@@ -42,7 +42,7 @@
 COMPILER =		studio
 BITS =			32
 PYTHON_VERSION =	2.6
-PYTHON_VERSIONS =	2.4 2.6
+PYTHON_VERSIONS =	2.6
 
 WS_LOGS =	$(WS_TOP)/logs
 WS_REPO =	$(WS_TOP)/repo
@@ -113,9 +113,6 @@
 
 LD =		/usr/bin/ld
 
-PYTHON.2.4.32 =	/usr/bin/python2.4
-PYTHON.2.4.64 =	/usr/bin/$(MACH64)/python2.4
-
 PYTHON.2.6.32 =	/usr/bin/python2.6
 PYTHON.2.6.64 =	/usr/bin/$(MACH64)/python2.6
upstream/oracle/userland-gate