--- a/components/tcl/expect/Makefile Fri May 25 17:10:36 2012 -0700
+++ b/components/tcl/expect/Makefile Tue May 29 10:27:59 2012 -0700
@@ -49,18 +49,20 @@
(cd $(@D); $(GMAKE) all ${SCRIPTS};)
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
-CONFIGURE_OPTIONS += --with-tcl="$(COMPONENT_DIR)/../tcl/build/$(MACH32)"
-CONFIGURE_OPTIONS += --with-tclinclude="$(COMPONENT_DIR)/../tcl/build/$(MACH32)/generic"
CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --with-tcl="$(COMPONENT_DIR)/../tcl/build/$(MACH$(BITS))"
+CONFIGURE_OPTIONS += --with-tclinclude="$(COMPONENT_DIR)/../tcl/build/$(MACH$(BITS))/generic"
+
+CONFIGURE_OPTIONS.64 += LDFLAGS="$(LDFLAGS) -m64"
COMPONENT_TEST_TARGETS = test
# common targets
-build: $(BUILD_32)
+build: $(BUILD_32_and_64)
-install: $(INSTALL_32)
+install: $(INSTALL_32_and_64)
-test: $(TEST_32)
+test: $(TEST_32_and_64)
# special targets due to tcl internals dependencies
../tcl/build/%/.built:
@@ -68,6 +70,8 @@
$(BUILD_32): ../tcl/build/$(MACH32)/.built
+$(BUILD_64): ../tcl/build/$(MACH64)/.built
+
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
include ../../../make-rules/depend.mk