--- a/open-src/common/Makefile.inc	Wed Dec 04 11:06:37 2013 -0800
+++ b/open-src/common/Makefile.inc	Fri Dec 13 15:36:33 2013 -0800
@@ -575,23 +575,26 @@
 
 ### Default rules for common build pattern
 
-LD_OPTIONS = -L$(PROTODIR)$(X11_DIR)/lib$(LIBSUBDIR) \
-	$(MODTYPE_LD_OPTIONS) $(MODULE_LD_OPTIONS)
+LD_OPTIONS = $(DEFAULT_LD_OPTIONS) $(MODTYPE_LD_OPTIONS) $(MODULE_LD_OPTIONS)
+
+LD_EXEC_OPTIONS  = $(DEFAULT_LD_EXEC_OPTIONS)
+LD_EXEC_OPTIONS += $(MODTYPE_LD_EXEC_OPTIONS) $(MODULE_LD_EXEC_OPTIONS)
 
+LD_SHARED_OPTIONS  = $(DEFAULT_LD_SHARED_OPTIONS)
+LD_SHARED_OPTIONS += $(MODTYPE_LD_SHARED_OPTIONS) $(MODULE_LD_SHARED_OPTIONS)
+
+BUILD_ENV  = LD_OPTIONS='$(LD_OPTIONS)'
+BUILD_ENV += LD_EXEC_OPTIONS='$(LD_EXEC_OPTIONS)'
+BUILD_ENV += LD_SHARED_OPTIONS='$(LD_SHARED_OPTIONS)'
+BUILD_ENV += PROTODIR='$(PROTODIR)'
+BUILD_ENV += MAKE='$(MODULE_MAKE)'
 # MKDIRPROG - Workaround parallel build race condition
 #		in older upstream packaged install-sh
-
-BUILD_ENV  = LD_OPTIONS='$(LD_OPTIONS)'
-BUILD_ENV += PROTODIR='$(PROTODIR)'
-BUILD_ENV += MAKE='$(MODULE_MAKE)'
 BUILD_ENV += MKDIRPROG='mkdir -p'
 BUILD_ENV += PYTHONPATH="$(PYTHON_PATH)"
 $(WITH_PARFAIT) BUILD_ENV += $(PARFAIT_ENV)
 BUILD_ENV += $(MODTYPE_BUILD_ENV) $(MODULE_BUILD_ENV)
 
-# ASLR tagging
-BUILD_ENV += LD_EXEC_OPTIONS='-z aslr=enable'
-
 DEFAULT_BUILD_MAKEFLAGS=$(MODTYPE_MAKEFLAGS) $(MODULE_MAKEFLAGS) \
 	$(MODTYPE_BUILD_MAKEFLAGS) $(MODULE_BUILD_MAKEFLAGS)