[vlc-commits] [Git][videolan/vlc][master] contrib: qt: only conditionnally use cygpath

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
c04381be by Alexandre Janniaux at 2021-10-28T04:59:33+00:00
contrib: qt: only conditionnally use cygpath

Otherwise, it breaks when building in wsl with Cygwin installed:

    ~/vlc$ cygpath.exe -pm /
    C:/msys64/

There is no point in converting from and to the same path convention.

- - - - -


1 changed file:

- contrib/src/qt/AddStaticLink.sh


Changes:

=====================================
contrib/src/qt/AddStaticLink.sh
=====================================
@@ -7,9 +7,12 @@
 # This could also be done in configure.ac to detect what plugins are available and where to add them
 
 REAL_PREFIX="$1"
+OS_NAME="`uname -o`"
+if [ "$OS_NAME" = "Cygwin" -o "$OS_NAME" = "Msys" ]; then
 if [ ! `cygpath.exe -pm / || echo FAIL` = "FAIL" ]; then
     REAL_PREFIX=`cygpath.exe -pm ${REAL_PREFIX}`
 fi
+fi
 
 PREFIX=$(python3 -c "import os; print(os.path.realpath('${REAL_PREFIX}'))")
 PLUGIN_PATH="$3"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c04381be97fa0a2ac11b64be9eb5d9e16e4975ee

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c04381be97fa0a2ac11b64be9eb5d9e16e4975ee
You're receiving this email because of your account on code.videolan.org.