components/bash/Makefile
branchs11-update
changeset 3462 3fbdd7a202d6
parent 3160 f485b27c5b6c
child 3661 47545fb8aed4
--- a/components/bash/Makefile	Sat Nov 08 13:47:17 2014 -0800
+++ b/components/bash/Makefile	Tue Nov 11 14:04:02 2014 -0800
@@ -70,7 +70,7 @@
 LDFLAGS =	$(LD_Z_REDLOCSYM)
 
 # The bash test harness needs the GNU userland utilities
-TEST_PATH = "PATH=$(BUILD_DIR_32):$(GNUBIN):$(USRBINDIR)"
+TEST_PATH = "PATH=$(BUILD_DIR_64):$(GNUBIN):$(USRBINDIR)"
 TEST_OUTPUT = $(COMPONENT_DIR)/bash_test_results_$(MACH).out
 
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
@@ -120,19 +120,21 @@
 CONFIGURE_OPTIONS  += 		--with-installed-readline=no	
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 
-TEST_ENV +=	-i
-TEST_ENV +=	$(TEST_PATH)
-TEST_ENV +=	$(TARGET_ENV)
+TEST_ENV +=     -i
+TEST_ENV +=     $(TEST_PATH)
+TEST_ENV +=     $(TARGET_ENV)
 
-build: $(BUILD_32)
+ASLR_MODE=$(ASLR_ENABLE)
 
-install: $(INSTALL_32)
+build: $(BUILD_64)
+
+install: $(INSTALL_64)
 	( cd $(PROTOUSRSHAREDIR)/locale ; \
 	    cp -Rp "en@boldquot" en ; \
 	    cp -Rp "en@boldquot" en_CA ; \
 	    cp -Rp "en@boldquot" en_GB )
 
-test: $(TEST_32)
+test: $(TEST_64)
 
 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)