[vlc-commits] commit: contribs: Use the gcc toolchain installed in /usr/bin instead of / Developer because the latter is no reliable path as it can be installed anywhere ( Felix Paul Kühne )

git at videolan.org git at videolan.org
Fri Nov 5 21:00:01 CET 2010


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Nov  5 20:59:50 2010 +0100| [8fad40cb68090eb6a8a8323d992939ad25a58bac] | committer: Felix Paul Kühne 

contribs: Use the gcc toolchain installed in /usr/bin instead of /Developer because the latter is no reliable path as it can be installed anywhere

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8fad40cb68090eb6a8a8323d992939ad25a58bac
---

 extras/contrib/bootstrap |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 7b58e39..251ac58 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -341,8 +341,8 @@ case "$DISTRO" in
     HAVE_DARWIN_9=1
     EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
     EXTRA_CFLAGS="${EXTRA_CFLAGS} -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
-    CC="/Developer/usr/bin/gcc-4.2"
-    CXX="/Developer/usr/bin/g++-4.2"
+    CC="/usr/bin/gcc-4.2"
+    CXX="/usr/bin/g++-4.2"
     add_makefile_cfg "PATH = /bin:/usr/bin:/usr/local/bin"
     add_makefile_cfg "SDK_TARGET = ${SDK_TARGET}"
     add_makefile_cfg "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}"
@@ -428,8 +428,8 @@ fi
 
 if test $HAVE_DARWIN_9; then
     add_makefile_cfg "HAVE_DARWIN_9 = 1"
-    if ! /Developer/usr/bin/gcc-4.2 --version>/dev/null 2>&1; then
-        error "You do not have GCC-4.2 instelled, compilation WILL FAIL."
+    if ! /usr/bin/gcc-4.2 --version>/dev/null 2>&1; then
+        error "You do not have GCC-4.2 installed in /usr/bin, compilation WILL FAIL."
     fi
 fi
 



More information about the vlc-commits mailing list