diff options
| author | davilla <davilla@4pi.com> | 2011-10-24 13:55:32 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2011-10-24 13:55:50 -0400 |
| commit | 1c0c296255c9865d4075aea97ffd75c82695b5a7 (patch) | |
| tree | ddaf3443b1aee8d56ef55a1404644fa5d304d02f /tools/darwin | |
| parent | f21c16f10389a5d56e442684a477ef60312a37f8 (diff) | |
[osx/ios] fixed aclocal path and add m4 export in generated config.site.mk
Diffstat (limited to 'tools/darwin')
| -rw-r--r-- | tools/darwin/depends/config.site_ios.mk.in | 3 | ||||
| -rw-r--r-- | tools/darwin/depends/config.site_osx.in | 2 | ||||
| -rw-r--r-- | tools/darwin/depends/config.site_osx.mk.in | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/darwin/depends/config.site_ios.mk.in b/tools/darwin/depends/config.site_ios.mk.in index f479f37ce8..a0507c98d2 100644 --- a/tools/darwin/depends/config.site_ios.mk.in +++ b/tools/darwin/depends/config.site_ios.mk.in @@ -21,10 +21,11 @@ export CXX=${platform_path}/usr/bin/g++-${platform_gcc_version} export CXXFLAGS+=-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} export AR=${platform_path}/usr/bin/ar export AS=@use_toolchain@/bin/gas-preprocessor.pl ${CC} +export M4=@use_toolchain@/bin/m4 export CCAS=--tag CC @use_toolchain@/bin/gas-preprocessor.pl ${CC} export STRIP=${platform_path}/usr/bin/strip export RANLIB=${platform_path}/usr/bin/ranlib -export ACLOCAL=aclocal -I ${PREFIX}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal +export ACLOCAL=@use_toolchain@/bin/aclocal -I ${PREFIX}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig diff --git a/tools/darwin/depends/config.site_osx.in b/tools/darwin/depends/config.site_osx.in index c92154fc4d..3c55108b80 100644 --- a/tools/darwin/depends/config.site_osx.in +++ b/tools/darwin/depends/config.site_osx.in @@ -34,7 +34,7 @@ export AS=${platform_path}/usr/bin/as export M4=@use_toolchain@/bin/m4 export STRIP=${platform_path}/usr/bin/strip export RANLIB=${platform_path}/usr/bin/ranlib -export ACLOCAL="@use_toolchain@/aclocal -I ${prefix}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal" +export ACLOCAL="@use_toolchain@/bin/aclocal -I ${prefix}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal" export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig diff --git a/tools/darwin/depends/config.site_osx.mk.in b/tools/darwin/depends/config.site_osx.mk.in index e046977f2f..de1ae24d0b 100644 --- a/tools/darwin/depends/config.site_osx.mk.in +++ b/tools/darwin/depends/config.site_osx.mk.in @@ -30,9 +30,10 @@ export CXX=/usr/bin/g++-${platform_gcc_version} export CXXFLAGS+=-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} export AR=${platform_path}/usr/bin/ar export AS=${platform_path}/usr/bin/as +export M4=@use_toolchain@/bin/m4 export STRIP=${platform_path}/usr/bin/strip export RANLIB=${platform_path}/usr/bin/ranlib -export ACLOCAL=aclocal -I ${PREFIX}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal +export ACLOCAL=@use_toolchain@/bin/aclocal -I ${PREFIX}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig |