21357930 tcl/expect failed at link stage with new 64-bit compiler
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 10 Aug 2015 11:49:13 -0700
changeset 4766 03ca3b29e678
parent 4765 fb36ce218f70
child 4767 8e8393bb8142
21357930 tcl/expect failed at link stage with new 64-bit compiler
components/tcl/expect/Makefile
--- a/components/tcl/expect/Makefile	Mon Aug 10 14:58:04 2015 -0700
+++ b/components/tcl/expect/Makefile	Mon Aug 10 11:49:13 2015 -0700
@@ -50,13 +50,14 @@
 
 COMPONENT_BUILD_TARGETS = all ${SCRIPTS}
 
+LDFLAGS +=		$(CC_BITS)
+
 CONFIGURE_OPTIONS 	+= CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS	+= LDFLAGS="$(LDFLAGS)"
 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_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 COMPONENT_TEST_TARGETS = test
 COMPONENT_TEST_TRANSFORMS += \
@@ -67,13 +68,9 @@
 
 # common targets
 configure:	$(CONFIGURE_32_and_64)
-
 build:		$(BUILD_32_and_64)
-
 install:	$(INSTALL_32_and_64) 
-	
 test: 		$(TEST_32_and_64)
-
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 # special targets due to tcl internals dependencies
@@ -81,10 +78,8 @@
 	(cd ../tcl ; $(GMAKE) build)
 
 $(CONFIGURE_32):	../tcl/build/$(MACH32)/.built
-
 $(CONFIGURE_64):	../tcl/build/$(MACH64)/.built
 
-
 REQUIRED_PACKAGES += runtime/tcl-8
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library