X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=b71defbeb00b653c311fce599df6b32ecda2711e;hb=2f66db56b3c178132bb9d8f595c890bb6fdb6a28;hp=f8004df59feb1d0e83d93530616dfdf76fcc3b7e;hpb=d6088a53a31d01e8acc930658a835e1002d0b8e8;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index f8004df5..b71defbe 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -79,6 +79,11 @@ if [ -z "$NECHUNG" ]; then # IS_MSYS will be non-empty if this is the msys toolset. otherwise # we assume that it's cygwin. IS_MSYS=$(uname | grep -i ming) + + # if not MSYS, then we'll assume cygwin and set the cygwin root var. + if [ -z "$IS_MSYS" ]; then + define_yeti_variable CYGROOT=$(cygpath -w -m /) + fi fi ############## @@ -204,11 +209,11 @@ if [ -z "$NECHUNG" ]; then # now augment the environment if we found our build variables. if [ $found_build_vars == 1 ]; then # the binary directory contains our collection of handy programs. - define_yeti_variable BINDIR=$TARGETS_DIR + define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_DIR # add binaries created within build to the path. - define_yeti_variable PATH="$(dos_to_unix_path $BINDIR):$PATH" + define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_BINARIES):$PATH" # Shared libraries are located via this variable. - define_yeti_variable LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $BINDIR)" + define_yeti_variable LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $FEISTY_MEOW_BINARIES)" fi }