Use the Lambda executable as the bootstrap when glibc is not required

Author: Marco Magdy

packaging/packager

@@ -171,22 +171,13 @@ exec \$LAMBDA_TASK_ROOT/lib/$PKG_LD --library-path \$LAMBDA_TASK_ROOT/lib \$LAMB
 EOF
 )
 
-bootstrap_script_no_libc=$(cat <<EOF
-#!/bin/bash
-set -euo pipefail
-export AWS_EXECUTION_ENV=lambda-cpp
-export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$LAMBDA_TASK_ROOT/lib
-exec \$LAMBDA_TASK_ROOT/bin/$PKG_BIN_FILENAME \${_HANDLER}
-EOF
-)
-
-cp "$PKG_BIN_PATH" "$PKG_DIR/bin"
 if [[ $INCLUDE_LIBC == true ]]; then
+    cp "$PKG_BIN_PATH" "$PKG_DIR/bin"
     echo -e "$bootstrap_script" > "$PKG_DIR/bootstrap"
+    chmod +x "$PKG_DIR/bootstrap"
 else
-    echo -e "$bootstrap_script_no_libc" > "$PKG_DIR/bootstrap"
+    cp "$PKG_BIN_PATH" "$PKG_DIR/bootstrap"
 fi
-chmod +x "$PKG_DIR/bootstrap"
 # some shenanigans to create the right layout in the zip file without extraneous directories
 pushd "$PKG_DIR" > /dev/null
 zip --symlinks --recurse-paths "$PKG_BIN_FILENAME".zip -- *