Index: ports/samba/build.sh |
diff --git a/ports/samba/build.sh b/ports/samba/build.sh |
index 69d434d74dffa80c6eab24bf3bb53d4d4dd0fc07..76b4fb3f88a8e8a99de07e81c7df42bc2a2ad675 100755 |
--- a/ports/samba/build.sh |
+++ b/ports/samba/build.sh |
@@ -9,22 +9,11 @@ BUILD_DIR=${SRC_DIR} |
EnableGlibcCompat |
ConfigureStep() { |
- conf_build=$(/bin/sh "${SCRIPT_DIR}/config.guess") |
NACLPORTS_CPPFLAGS+=" -DFAKE_GET_INTERFACES=1" |
NACLPORTS_CPPFLAGS="${NACLPORTS_CPPFLAGS/-fdiagnostics-color=auto/}" |
NACLPORTS_LDFLAGS="${NACLPORTS_CPPFLAGS/-fdiagnostics-color=auto/}" |
SetupCrossEnvironment |
- local CONFIGURE=${NACL_CONFIGURE_PATH:-${SRC_DIR}/configure} |
- local conf_host=${NACL_CROSS_PREFIX} |
- if [ "${NACL_ARCH}" = "pnacl" -o "${NACL_ARCH}" = "emscripten" ]; then |
- # The PNaCl tools use "pnacl-" as the prefix, but config.sub |
- # does not know about "pnacl". It only knows about "le32-nacl". |
- # Unfortunately, most of the config.subs here are so old that |
- # it doesn't know about that "le32" either. So we just say "nacl". |
- conf_host="nacl" |
- fi |
- |
# Inject a shim that speed up pnacl invocations for configure. |
if [ "${NACL_ARCH}" = "pnacl" ]; then |
local PNACL_CONF_SHIM="${TOOLS_DIR}/pnacl-configure-shim.py" |
@@ -38,8 +27,8 @@ ConfigureStep() { |
# For example a trivial PNaCl binary can sometimes run on the linux host if |
# it has the correct LLVM bimfmt support. What is more, autoconf will |
# generate a warning if only --host is specified. |
- LogExecute "${CONFIGURE}" \ |
- --build=${conf_build} \ |
+ LogExecute "${SRC_DIR}/configure" \ |
+ --build=${CONF_BUILD} \ |
--hostcc=gcc \ |
--cross-compile \ |
--cross-answers=${START_DIR}/answers \ |