always use declare_symlink

Author: rickeylev

python/private/py_executable_bazel.bzl

@@ -362,9 +362,16 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
     runtime = runtime_details.effective_runtime
     if runtime.interpreter:
         py_exe_basename = paths.basename(runtime.interpreter.short_path)
-        interpreter = ctx.actions.declare_file("{}/bin/{}".format(venv, py_exe_basename))
-        ctx.actions.symlink(output = interpreter, target_file = runtime.interpreter)
+
+        ##interpreter = ctx.actions.declare_file("{}/bin/{}".format(venv, py_exe_basename))
+        ##ctx.actions.symlink(output = interpreter, target_file = runtime.interpreter)
+        interpreter = ctx.actions.declare_symlink("{}/bin/{}".format(venv, py_exe_basename))
         interpreter_actual_path = runtime.interpreter.short_path
+        parent = "/".join([".."] * (interpreter_actual_path.count("/") + 1))
+        rel_path = parent + "/" + interpreter_actual_path
+        ctx.actions.symlink(output = interpreter, target_path = rel_path)
+        ##interpreter_actual_path = runtime.interpreter.short_path
+
     else:
         py_exe_basename = paths.basename(runtime.interpreter_path)
         interpreter = ctx.actions.declare_symlink("{}/bin/{}".format(venv, py_exe_basename))

python/private/stage1_bootstrap_template.sh

@@ -129,10 +129,11 @@ if [[ "$IS_ZIPFILE" == "1" ]]; then
   mkdir -p "$(dirname $python_exe)"
   ln -s "$symlink_to" "$python_exe"
 else
-  set -x
-  stat "$python_exe"
-  ls -l $(dirname $python_exe)
-  set +x
+  :
+  #set -x
+  #stat "$python_exe"
+  #ls -l $(dirname $python_exe)
+  #set +x
 fi
 
 # At this point, we should have a valid reference to the interpreter.