diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /package/openssh/Makefile | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'package/openssh/Makefile')
| -rw-r--r-- | package/openssh/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile index a56ee80de..409e63c0a 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" endif ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y) CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" -TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal +TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal endif ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) |