Support repositories created with git worktree

* .git is a file in worktree-created copies. * Determines the correct directory using git command, when running configure. * Fixes #16808. Change-Id: I72c7b2e79aac5140d35e0339fad16160a35911ae Reviewed-on: https://review.haiku-os.org/c/haiku/+/6914 Reviewed-by: Adrien Destugues <[email protected]> Reviewed-by: Jérôme Duval <[email protected]> Reviewed-by: waddlesplash <[email protected]> Tested-by: Commit checker robot <[email protected]>
2023-11-01 09:09:27 +00:00
parent 4391f32b36
commit 6f58244192
2 changed files with 17 additions and 7 deletions
@@ -565,6 +565,7 @@ fi
 # backup the passed arguments
 configureArgs="$@"
 configurePath=$0
+configureDir=`dirname $configurePath`

 # backup relevant environs
 configureEnvirons=
@@ -635,6 +636,7 @@ fi

 # exported (BuildSetup) default parameter values
 #
+GIT_DIR=`git -C "$configureDir" rev-parse --git-dir | sed 's/^gitdir: //'`
 HOST_GCC_RAW_VERSION=`$CC -dumpversion`
 HOST_CC_IS_LEGACY_GCC=`is_legacy_gcc $HOST_GCC_RAW_VERSION`
 HOST_GCC_MACHINE=`$CC -dumpmachine`
@@ -1102,6 +1104,8 @@ cat << EOF > "$buildConfigFile"
 #e ${configureEnvirons}
 #a ${configureArgs}

+GIT_DIR						?= "${GIT_DIR}" ;
+
 HOST_PLATFORM				?= "${HOST_PLATFORM}" ;
 TARGET_PLATFORM 			?= "${TARGET_PLATFORM}" ;
 HAIKU_PACKAGING_ARCHS		?= ${HAIKU_PACKAGING_ARCHS} ;