etc/common-cross-config.site: Search our `include' and `lib' directories.

[mdw-cross] / etc / common-cross-config.site

diff --git a/etc/common-cross-config.site b/etc/common-cross-config.site
index b1d01da..704c79b 100644 (file)
--- a/etc/common-cross-config.site
+++ b/etc/common-cross-config.site
@@ -4,9 +4,29 @@ prefix=$CROSS_PREFIX
 libexecdir=\${exec_prefix}/lib
 sysconfdir=\${prefix}/etc
 
-host_alias=$CROSS_ARCH
-cross_compiling=yes
-CC="$CROSS_COMPILER_PREFIX$CROSS_ARCH-gcc$CROSS_CFLAGS"
+host_alias=$CROSS_ARCH ac_tool_prefix=$CROSS_ARCH-
 
-PKG_CONFIG_PATH=$prefix/lib/pkgconfig:/usr/lib/pkgconfig
-export PKG_CONFIG_PATH
+case ${CROSS_NATIVE_P-nil},${CROSS_COMPILER-gcc} in
+  t,gcc)
+    CC="${CROSS_COMPILER_PREFIX}gcc$CROSS_gcc_FLAGS"
+    CXX="${CROSS_COMPILER_PREFIX}g++$CROSS_gxx_FLAGS"
+    ;;
+  nil,gcc)
+    cross_compiling=yes
+    CC="$CROSS_COMPILER_PREFIX$CROSS_ARCH-gcc$CROSS_gcc_FLAGS"
+    CXX="$CROSS_COMPILER_PREFIX$CROSS_ARCH-g++$CROSS_gxx_FLAGS"
+    ;;
+  t,clang)
+    CC="${CROSS_COMPILER_PREFIX}clang$CROSS_clang_FLAGS"
+    CXX="${CROSS_COMPILER_PREFIX}clang++$CROSS_clangxx_FLAGS"
+    ;;
+  nil,clang)
+    cross_compiling=yes
+    CC="$CROSS_COMPILER_PREFIX${CROSS_clang_TOOL-clang}$CROSS_clang_FLAGS"
+    CXX="$CROSS_COMPILER_PREFIX${CROSS_clangxx_TOOL-clang++}$CROSS_clangxx_FLAGS"
+    CCASFLAGS="-no-integrated-as -Wno-unicode"
+    ;;
+esac
+
+CPPFLAGS="$CPPFLAGS -I$CROSS_PREFIX/include"
+LDFLAGS="$LDFLAGS -L$CROSS_PREFIX/lib"