< prev index next >

make/linux/makefiles/vm.make

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.

@@ -342,26 +342,26 @@
 # SELinux is configured to be enabled, the runtime linker will fail to apply
 # the text relocation to libjvm.so considering that it is built as a non-PIC
 # DSO. To workaround that, we run chcon to libjvm.so after it is built. See
 # details in bug 6538311.
 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
-        $(QUIETLY) {                                                    \
-            echo $(LOG_INFO) Linking vm...;                             \
-            $(LINK_LIB.CXX/PRE_HOOK)                                     \
-            $(LINK_VM) $(LD_SCRIPT_FLAG)                                \
-                       $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM);       \
-            $(LINK_LIB.CXX/POST_HOOK)                                    \
-            rm -f $@.1; ln -s $@ $@.1;                                  \
-            if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then                    \
-              if [ -x /usr/sbin/selinuxenabled ] ; then                 \
-                if /usr/sbin/selinuxenabled; then                       \
-                  if ! /usr/bin/chcon -t textrel_shlib_t $@; then       \
-                    echo "ERROR: Cannot chcon $@";                      \
-                  fi                                                    \
-                fi                                                      \
-              fi                                                        \
-            fi                                                          \
+        $(QUIETLY) {                                                        \
+            echo $(LOG_INFO) Linking vm...;                                 \
+            $(LINK_LIB.CXX/PRE_HOOK)                                        \
+            $(LINK_VM) $(LD_SCRIPT_FLAG)                                    \
+                       $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM);   \
+            $(LINK_LIB.CXX/POST_HOOK)                                       \
+            rm -f $@.1; ln -s $@ $@.1;                                      \
+            if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then                  \
+              if [ -x /usr/sbin/selinuxenabled ] ; then                     \
+                if /usr/sbin/selinuxenabled; then                           \
+                  if ! /usr/bin/chcon -t textrel_shlib_t $@; then           \
+                    echo "ERROR: Cannot chcon $@";                          \
+                  fi                                                        \
+                fi                                                          \
+              fi                                                            \
+            fi                                                              \
         }
 
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
         $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
         $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
< prev index next >