Differences From Artifact [1f2a192f9a]:

• Executable file tls/build.sh — part of check-in [d940453a88] at 2016-09-06 06:59:02 on branch trunk — More work to make TLS work on more platforms (user: rkeene, size: 3670) [annotate] [blame] [check-ins using]

To Artifact [e69d6c7eca]:

• Executable file tls/build.sh — part of check-in [20deaf934e] at 2016-09-06 15:21:11 on branch trunk — Fixed issue with static linking of TLS when also building a local static executable (user: rkeene, size: 3651) [annotate] [blame] [check-ins using]

130
131
132
133
134
135
136
137
138
139
140
141
142

			addlibs="-L${SSL_LIB_DIR:-/lib} -lssl -lcrypto"
			addlibs_staticOnly=""
		fi

		addlibs="${addlibs} ${KC_TLS_LINKADD}"

		if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
			echo "-Wl,-Bstatic ${addlibs} ${addlibs_staticOnly} -Wl,-Bdynamic"
		else
			echo "${addlibs}"
		fi > "${linkaddfile}"
	fi
}

|

130
131
132
133
134
135
136
137
138
139
140
141
142

			addlibs="-L${SSL_LIB_DIR:-/lib} -lssl -lcrypto"
			addlibs_staticOnly=""
		fi

		addlibs="${addlibs} ${KC_TLS_LINKADD}"

		if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
			echo "#STATIC ${addlibs} ${addlibs_staticOnly}"
		else
			echo "${addlibs}"
		fi > "${linkaddfile}"
	fi
}