Check-in [a0dcb20ebc]
Overview
Comment:Updated to detect static linking options dynamically
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tls-1-7
Files: files | file ages | folders
SHA1: a0dcb20ebc4be6fb819ae92d13d21f70be5a460a
User & Date: rkeene on 2016-12-07 19:22:13
Other Links: branch diff | manifest | tags
Context
2016-12-07
19:31
Updated to default to not setting the RPATH if we are linking statically to the SSL library check-in: 9f920bf04f user: rkeene tags: tls-1-7
19:22
Updated to detect static linking options dynamically check-in: a0dcb20ebc user: rkeene tags: tls-1-7
19:21
Updated to latest remote shobj.m4 check-in: d33155cd64 user: rkeene tags: tls-1-7
Changes
91
92
93
94
95
96
97

98
99
100
101
102
103
104
105
						new_TCLTLS_SSL_LIBS_static="${new_TCLTLS_SSL_LIBS_static} ${arg}"
						;;
					*)
						new_TCLTLS_SSL_LIBS_normal="${new_TCLTLS_SSL_LIBS_normal} ${arg}"
						;;
				esac
			done

			TCLTLS_SSL_LIBS="${new_TCLTLS_SSL_LIBS_normal} -Wl,-Bstatic ${new_TCLTLS_SSL_LIBS_static} -Wl,-Bdynamic"
		fi
	fi

	dnl Save compile-altering variables we are changing
	SAVE_LIBS="${LIBS}"
	SAVE_CFLAGS="${CFLAGS}"
	SAVE_CPPFLAGS="${CPPFLAGS}"







>
|







91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
						new_TCLTLS_SSL_LIBS_static="${new_TCLTLS_SSL_LIBS_static} ${arg}"
						;;
					*)
						new_TCLTLS_SSL_LIBS_normal="${new_TCLTLS_SSL_LIBS_normal} ${arg}"
						;;
				esac
			done
			SHOBJ_DO_STATIC_LINK_LIB([OpenSSL], [$new_TCLTLS_SSL_LIBS_static], [new_TCLTLS_SSL_LIBS_static])
			TCLTLS_SSL_LIBS="${new_TCLTLS_SSL_LIBS_normal} ${new_TCLTLS_SSL_LIBS_static}"
		fi
	fi

	dnl Save compile-altering variables we are changing
	SAVE_LIBS="${LIBS}"
	SAVE_CFLAGS="${CFLAGS}"
	SAVE_CPPFLAGS="${CPPFLAGS}"