# HG changeset patch
# User Enrico Perla <enrico.perla@oracle.com>
# Date 1478298123 25200
# Node ID 6e3eadd7bb7109740e7f1524c567640211320969
# Parent  59571297171700eb0225d9e8bfc8f6ba44e37409
20029192 Userland should build with ld -z sx=nx* flags instead of map.noexstk (fix backslashes)

diff -r 595712971717 -r 6e3eadd7bb71 make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Fri Nov 04 14:44:27 2016 -0500
+++ b/make-rules/shared-macros.mk	Fri Nov 04 15:22:03 2016 -0700
@@ -1144,12 +1144,13 @@
 # environment(s).  These are the initial settings.
 COMPONENT_BUILD_ENV= \
     LD_OPTIONS="$(LD_OPTIONS)" \
-    LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)"\
-    LD_PIE_OPTIONS="$(LD_PIE_OPTIONS)"\
+    LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" \
+    LD_PIE_OPTIONS="$(LD_PIE_OPTIONS)"
+
 COMPONENT_INSTALL_ENV= \
     LD_OPTIONS="$(LD_OPTIONS)" \
-    LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)"\
-    LD_PIE_OPTIONS="$(LD_PIE_OPTIONS)"\
+    LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" \
+    LD_PIE_OPTIONS="$(LD_PIE_OPTIONS)"
 
 # Add any bit-specific settings
 COMPONENT_BUILD_ENV += $(COMPONENT_BUILD_ENV.$(BITS))