ssh_client: openssh: simplify the build a bit

We currently put "-pnacl" in the libs we create.  I guess we did this
so we could keep it separate from "-nacl" in the output/ dir, but that
doesn't work well when we write all the objects from the plugin src/
w/out any suffixes to the output/ dir.

Since we no longer support NaCl (only PNaCl), and because we're going
to take a radically different approach for separating out wasm, drop
the "-pnacl" suffix everywhere.

While we're here, move the cache vars from the env to the configure
invocation.  This will help with later build migrations too.

Change-Id: I816d7c3ac649839068bf419e83efe9bff6a63e8f
Reviewed-on: https://chromium-review.googlesource.com/c/1289810
Reviewed-by: Vitaliy Shipitsyn <[email protected]>
Tested-by: Mike Frysinger <[email protected]>

Author: vapier

ssh_client/src/Makefile

@@ -77,8 +77,8 @@ $(POBJS): $(OUTPUT)/%_p.o : $(CURDIR)/%.cc
 	$(PNACL_CXX) -o $@ -c $< $(PNACL_CXXFLAGS)
 
 $(PROJECT)_nl.pexe : $(POBJS)
-	$(PNACL_CXX) -o $@ $^ -lopenssh-pnacl -lssh-pnacl \
-		-lopenbsd-compat-pnacl -lglibc-compat \
+	$(PNACL_CXX) -o $@ $^ -lopenssh -lssh \
+		-lopenbsd-compat -lglibc-compat \
 		$(PNACL_LDFLAGS) $(PNACL_CXXFLAGS)
 
 $(PROJECT)_nl_arm.dbg.nexe : $(PROJECT)_nl.pexe

ssh_client/third_party/openssh-7.8/build.sh

@@ -22,7 +22,7 @@ readonly PATCH_FILE=$(echo "${FILESDIR}"/*.patch)
 
 pushd output >/dev/null
 
-if [[ -f libopenssh-pnacl.a ]]; then
+if [[ -f libopenssh.a ]]; then
   exit 0
 fi
 
@@ -34,13 +34,11 @@ export AR=${NACLAR}
 export RANLIB=${NACLRANLIB}
 
 # Assume PNaCl toolchain.
-readonly NACL_ARCH="pnacl"
 readonly NACL_TOOLCHAIN_INSTALL=${NACL_TOOLCHAIN_ROOT}/le32-nacl
 
 readonly WEBPORTS_PREFIX=${NACL_TOOLCHAIN_INSTALL}/usr
 readonly WEBPORTS_INCLUDE=${WEBPORTS_PREFIX}/include
 readonly WEBPORTS_LIBDIR=${WEBPORTS_PREFIX}/lib
-readonly WEBPORTS_BIN=${WEBPORTS_PREFIX}/bin
 
 export PKG_CONFIG_LIBDIR=${WEBPORTS_LIBDIR}
 export PKG_CONFIG_PATH=${PKG_CONFIG_LIBDIR}/pkgconfig
@@ -97,10 +95,11 @@ EXTRA_CONFIGURE_FLAGS=(
   # These don't work with newlib (used in PNaCl).
   --without-stackprotect
   --without-hardening
+
+  ac_cv_func_inet_aton=no
+  ac_cv_func_inet_ntoa=no
+  ac_cv_func_inet_ntop=no
 )
-export ac_cv_func_inet_aton=no
-export ac_cv_func_inet_ntoa=no
-export ac_cv_func_inet_ntop=no
 
 # The prefix path matches what is used at runtime.
 if [[ ! -e Makefile ]]; then
@@ -128,9 +127,9 @@ make -j${ncpus} \
     "${objects[@]}" \
     libssh.a \
     openbsd-compat/libopenbsd-compat.a
-$AR rcs ../libopenssh-${NACL_ARCH}.a "${objects[@]}"
-cp -f libssh.a ../libssh-${NACL_ARCH}.a
-cp -f openbsd-compat/libopenbsd-compat.a ../libopenbsd-compat-${NACL_ARCH}.a
+$AR rcs ../libopenssh.a "${objects[@]}"
+cp -f libssh.a ../libssh.a
+cp -f openbsd-compat/libopenbsd-compat.a ../libopenbsd-compat.a
 cp -f *.[0-9].html ../
 
 popd >/dev/null