Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(785)

Unified Diff: ports/openssh/build.sh

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ports/ninja/nacl.patch ('k') | ports/openssh/nacl.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/openssh/build.sh
diff --git a/ports/openssh/build.sh b/ports/openssh/build.sh
index 44b49b05cefc54f8bc6a001f2a7c57908ae9c33a..2cff561435bd3452ae4488fbcf2252cd0a8fdde7 100644
--- a/ports/openssh/build.sh
+++ b/ports/openssh/build.sh
@@ -16,7 +16,6 @@ EXTRA_CONFIGURE_ARGS="--with-privsep-path=${PREFIX}/var/empty"
export ac_cv_func_truncate=yes
export ac_cv_func_sigaction=yes
-export SSHLIBS="${NACL_CLI_MAIN_LIB}"
if [ "${NACL_LIBC}" = "newlib" ]; then
NACLPORTS_LIBS+=" -lcrypto"
export LD="${NACLCXX}"
@@ -28,11 +27,10 @@ if [ "${NACL_LIBC}" = "glibc" ]; then
EXTRA_CONFIGURE_ARGS+=" --disable-strip"
fi
+EnableCliMain
EnableGlibcCompat
PublishStep() {
- DefaultInstallStep
-
MakeDir ${PUBLISH_DIR}
local ASSEMBLY_DIR="${PUBLISH_DIR}/openssh"
MakeDir ${ASSEMBLY_DIR}
« no previous file with comments | « ports/ninja/nacl.patch ('k') | ports/openssh/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698