# HG changeset patch # User Rich Burridge # Date 1398895118 25200 # Node ID d81c0c5a6628fc6cfff8c6bf7fcf8f4e3fd34551 # Parent 9e62f492c72b24938c21c4e3600cb97071ffaf2f 18685306 swig should switch to using ruby 1.9 diff -r 9e62f492c72b -r d81c0c5a6628 components/swig/Makefile --- a/components/swig/Makefile Wed Apr 30 09:30:49 2014 -0700 +++ b/components/swig/Makefile Wed Apr 30 14:58:38 2014 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -45,8 +45,6 @@ CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)" CONFIGURE_OPTIONS += --with-javaincl="$(JAVA_HOME)/include" -# keep swig building with ruby 1.8 for now -CONFIGURE_OPTIONS += --with-ruby=$(RUBY.1.8) ASLR_MODE = $(ASLR_ENABLE)