diff options
| -rw-r--r-- | tools/depends/Makefile.include.in | 1 | ||||
| -rw-r--r-- | tools/depends/configure.ac | 36 | ||||
| -rw-r--r-- | tools/depends/target/config-binaddons.site.in | 16 | ||||
| -rw-r--r-- | tools/depends/target/config.site.in | 19 | ||||
| -rw-r--r-- | tools/depends/target/gmp/Makefile | 5 |
5 files changed, 12 insertions, 65 deletions
diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index d7d46504ac..3d31962c90 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -22,7 +22,6 @@ CROSS_COMPILING=@cross_compiling@ ARCH_DEFINES=@ARCH_DEFINES@ NATIVE_ARCH_DEFINES=@NATIVE_ARCH_DEFINES@ TARGET_PLATFORM=@target_platform@ -XCODE_VERSION=@use_xcode@ AAPT=@AAPT@ DX=@DX@ ZIPALIGN=@ZIPALIGN@ diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index 72a62887c4..1c50404a78 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -260,30 +260,19 @@ case $host in native_platform_min_version=-mmacosx-version-min=`sw_vers | grep ProductVersion | sed -E "s/.*:.*(10\..*)\.?.*/\1/"` use_xcodepath=`xcode-select -print-path` use_xcodebuild=$use_xcodepath/usr/bin/xcodebuild - use_xcode=[`$use_xcodebuild -version | grep Xcode | awk '{ print $2}'`] AC_MSG_RESULT(found xcodebuild at $use_xcodebuild) use_build_toolchain=$use_xcodepath + use_toolchain="${use_xcodepath}/Toolchains/XcodeDefault.xctoolchain" # darwin builds are always cross cross_compiling="yes" - platform_cflags="-std=gnu99 -no_compact_linkedit -no-cpp-precomp" - platform_ldflags="-Wl,-search_paths_first -no_compact_linkedit" - platform_cxxflags="-no_compact_linkedit -no-cpp-precomp" + platform_cc=clang + platform_cxx=clang++ + platform_cflags="-fheinous-gnu-extensions -no-cpp-precomp" + platform_ldflags="-Wl,-search_paths_first" + platform_cxxflags="-no-cpp-precomp" - case $use_xcode in - 4.* | 4.*.*) - platform_cc=llvm-gcc-4.2 - platform_cxx=llvm-g++-4.2 - ;; - *) - platform_cc=clang - platform_cxx=clang++ - platform_cflags="-fheinous-gnu-extensions -no-cpp-precomp" - platform_ldflags="-Wl,-search_paths_first" - platform_cxxflags="-no-cpp-precomp" - ;; - esac case $host in *86*-apple-darwin) MC_CHECK_NOT_CPU([$use_cpu], "arm") @@ -325,16 +314,6 @@ case $host in use_sdk_path=[`$use_xcodebuild -version -sdk $sdk_name Path`] platform_os="osx" - - # find the matching toolchain - case $use_xcode in - 5.* | 5.*.* ) - use_toolchain="${use_xcodepath}/Toolchains/XcodeDefault.xctoolchain" - ;; - *) - use_toolchain="${use_toolchain:-$use_xcodepath}" - ;; - esac ;; arm-apple-darwin*) @@ -377,8 +356,6 @@ case $host in ;; esac - use_toolchain="${use_xcodepath}/Toolchains/XcodeDefault.xctoolchain" - platform_os="ios" if [ ! test "x$use_cpu" = "xarm64" ]; then @@ -693,7 +670,6 @@ AC_SUBST(has_zlib) AC_SUBST(link_iconv) AC_SUBST(need_libiconv) AC_SUBST(use_gplv3) -AC_SUBST(use_xcode) AC_SUBST(use_ccache) AC_SUBST(native_platform_min_version) AC_SUBST(app_rendersystem) diff --git a/tools/depends/target/config-binaddons.site.in b/tools/depends/target/config-binaddons.site.in index 94bdb73733..ef11edbe25 100644 --- a/tools/depends/target/config-binaddons.site.in +++ b/tools/depends/target/config-binaddons.site.in @@ -134,22 +134,6 @@ if test "@platform_os@" = "ios"; then ac_cv_func_clock_gettime=no ac_cv_func_getentropy=no - # tweaks for libffi (ios must use llvm-gcc-4.2) - if test "${PACKAGE_NAME}" = "libffi" ; then - case "@use_xcode@" in - 4.* | 4.*.*) - export CC="@use_toolchain@/usr/bin/llvm-gcc-4.2" - export CPP="@use_toolchain@/usr/bin/llvm-gcc-4.2 -E" - ;; - *) - export CC="@use_toolchain@/usr/bin/clang" - export CPP="@use_toolchain@/usr/bin/clang -E" - ;; - esac - unset AS - unset CCAS - fi - # tweaks for flac if test "${ac_unique_file}" = "src/flac/main.c" ; then # compiler barfs if we use -O3/O2 for flac diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in index 3845b59bf3..74fc40df34 100644 --- a/tools/depends/target/config.site.in +++ b/tools/depends/target/config.site.in @@ -155,26 +155,11 @@ if test "@platform_os@" = "ios"; then ac_cv_func_clock_gettime=no ac_cv_func_getentropy=no - # tweaks for libffi (ios must use llvm-gcc-4.2) + # tweaks for libffi if test "${PACKAGE_NAME}" = "libffi" ; then - case "@use_xcode@" in - 4.* | 4.*.*) - export CC="@use_toolchain@/usr/bin/llvm-gcc-4.2" - export CPP="@use_toolchain@/usr/bin/llvm-gcc-4.2 -E" - ;; - *) - export CC="@use_toolchain@/usr/bin/clang" - export CPP="@use_toolchain@/usr/bin/clang -E" - ;; - esac - if test "@use_cpu@" = "arm64"; then - host=aarch64-apple-darwin host_alias=aarch64-apple-darwin - fi - - unset AS - unset CCAS + fi fi # tweaks for flac diff --git a/tools/depends/target/gmp/Makefile b/tools/depends/target/gmp/Makefile index c83048c729..cf14bccec6 100644 --- a/tools/depends/target/gmp/Makefile +++ b/tools/depends/target/gmp/Makefile @@ -19,7 +19,7 @@ ifeq ($(OS),linux) endif ifeq ($(OS),ios) -CONFIGURE_FLAGS=CC_FOR_BUILD=llvm-gcc CPP_FOR_BUILD="llvm-gcc -E" --disable-assembly +CONFIGURE_FLAGS=--disable-assembly endif ifeq ($(OS),osx) CONFIGURE_FLAGS=--with-pic @@ -27,6 +27,9 @@ endif ifeq ($(OS), android) CONFIGURE_FLAGS=--with-pic endif +ifeq ($(NATIVE_OS), osx) +CONFIGURE_FLAGS+= CC_FOR_BUILD="$(CC_FOR_BUILD)" CPP_FOR_BUILD="$(CC_FOR_BUILD) -E" +endif # configuration settings CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ |