1.1 --- a/make/linux/makefiles/vm.make Wed Jul 28 17:57:43 2010 -0400
1.2 +++ b/make/linux/makefiles/vm.make Tue Aug 03 08:13:38 2010 -0400
1.3 @@ -98,6 +98,7 @@
1.4
1.5 # Extra flags from gnumake's invocation or environment
1.6 CFLAGS += $(EXTRA_CFLAGS)
1.7 +LFLAGS += $(EXTRA_CFLAGS)
1.8
1.9 LIBS += -lm -ldl -lpthread
1.10
1.11 @@ -210,15 +211,17 @@
1.12 $(LINK_LIB.CC/POST_HOOK) \
1.13 rm -f $@.1; ln -s $@ $@.1; \
1.14 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
1.15 - if [ -x /usr/sbin/selinuxenabled ] ; then \
1.16 - /usr/sbin/selinuxenabled; \
1.17 - if [ $$? = 0 ] ; then \
1.18 - /usr/bin/chcon -t textrel_shlib_t $@; \
1.19 - if [ $$? != 0 ]; then \
1.20 - echo "ERROR: Cannot chcon $@"; \
1.21 - fi \
1.22 - fi \
1.23 - fi \
1.24 + if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \
1.25 + if [ -x /usr/sbin/selinuxenabled ] ; then \
1.26 + /usr/sbin/selinuxenabled; \
1.27 + if [ $$? = 0 ] ; then \
1.28 + /usr/bin/chcon -t textrel_shlib_t $@; \
1.29 + if [ $$? != 0 ]; then \
1.30 + echo "ERROR: Cannot chcon $@"; \
1.31 + fi \
1.32 + fi \
1.33 + fi \
1.34 + fi \
1.35 }
1.36
1.37 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
