aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/target
diff options
context:
space:
mode:
authorCory Fields <theuni-nospam-@xbmc.org>2013-03-13 12:07:34 -0400
committerCory Fields <theuni-nospam-@xbmc.org>2013-03-13 13:28:59 -0400
commitc5609c0e890847545302a7edd37802f4549f2233 (patch)
treea8e9cf600d85710cafe612df313dea5684363ba5 /tools/depends/target
parent85abcdf0e62ed4253343c8440ad7f32834df52e3 (diff)
depends: fixup paths after f32039928
Diffstat (limited to 'tools/depends/target')
-rw-r--r--tools/depends/target/config.site.in16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in
index 3522ee6827..20576143e1 100644
--- a/tools/depends/target/config.site.in
+++ b/tools/depends/target/config.site.in
@@ -16,8 +16,8 @@ RANLIB="@RANLIB@"
OBJDUMP="@OBJDUMP@"
if test "@platform_os@" = "ios" ; then
- export AS="@prefix@/@build_cpu@-@build_os@-native/bin/gas-preprocessor.pl @CC@"
- export CCAS="--tag CC @prefix@/@build_cpu@-@build_os@-native/bin/gas-preprocessor.pl @CC@"
+ export AS="@prefix@/@tool_dir@/bin/gas-preprocessor.pl @CC@"
+ export CCAS="--tag CC @prefix@/@tool_dir@/bin/gas-preprocessor.pl @CC@"
fi
CFLAGS="@platform_cflags@ @platform_includes@ -I@prefix@/@deps_dir@/include $CFLAGS"
@@ -25,21 +25,21 @@ LDFLAGS="-L@prefix@/@deps_dir@/lib @platform_ldflags@ $LDFLAGS"
CXXFLAGS="@platform_cxxflags@ @platform_includes@ -I@prefix@/@deps_dir@/include $CXXFLAGS"
CPPFLAGS="@platform_cflags@ @platform_includes@ -I@prefix@/@deps_dir@/include $CPPFLAGS"
-export PKG_CONFIG=@prefix@/@build_cpu@-@build_os@-native/bin/pkg-config
+export PKG_CONFIG=@prefix@/@tool_dir@/bin/pkg-config
export PKG_CONFIG_PATH=@prefix@/@deps_dir@/lib/pkgconfig
-export YASM=@prefix@/@build_cpu@-@build_os@-native/bin/yasm
-export NASM=@prefix@/@build_cpu@-@build_os@-native/bin/yasm
+export YASM=@prefix@/@tool_dir@/bin/yasm
+export NASM=@prefix@/@tool_dir@/bin/yasm
export MYSQL_CONFIG=@prefix@/@deps_dir@/bin/mysql_config
-PATH=@prefix@/@build_cpu@-@build_os@-native/bin:@use_toolchain@/usr/bin:@use_toolchain@/bin:$PATH
-LD_LIBRARY_PATH=@prefix@/@build_cpu@-@build_os@-native/lib:$LD_LIBRARY_PATH
+PATH=@prefix@/@tool_dir@/bin:@use_toolchain@/usr/bin:@use_toolchain@/bin:$PATH
+LD_LIBRARY_PATH=@prefix@/@tool_dir@/lib:$LD_LIBRARY_PATH
PYTHON_VERSION=2.6
PYTHON_LDFLAGS="-L@prefix@/@deps_dir@/lib -lpython${PYTHON_VERSION} -lc -ldl -lm -lexpat -lffi -lintl -lutil -lssl -lcrypto"
PYTHON_CPPFLAGS=-I@prefix@/@deps_dir@/include/python${PYTHON_VERSION}
PYTHON_SITE_PKG=@prefix@/@deps_dir@/lib/python${PYTHON_VERSION}/site-packages
PYTHON_NOVERSIONCHECK=no-check
-USE_TEXTUREPACKER_NATIVE_ROOT=@prefix@/@build_cpu@-@build_os@-native
+USE_TEXTUREPACKER_NATIVE_ROOT=@prefix@/@tool_dir@
#afps-ng and libomxil-bellagio
ac_cv_func_malloc_0_nonnull=yes