Commit 7cd36a7a authored by mru's avatar mru

Use DEPCC to find dependencies, default to same as CC

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19408 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f761a82b
...@@ -995,6 +995,7 @@ CMDLINE_SET=" ...@@ -995,6 +995,7 @@ CMDLINE_SET="
cc cc
cpu cpu
cross_prefix cross_prefix
dep_cc
extra_version extra_version
host_cc host_cc
host_cflags host_cflags
...@@ -1269,7 +1270,7 @@ target_path='.' ...@@ -1269,7 +1270,7 @@ target_path='.'
# gcc stupidly only outputs the basename of targets with -MM, but we need the # gcc stupidly only outputs the basename of targets with -MM, but we need the
# full relative path for objects in subdirectories for non-recursive Make. # full relative path for objects in subdirectories for non-recursive Make.
DEPEND_CMD='$(CC) $(CPPFLAGS) -MM $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o,"' DEPEND_CMD='$(DEPCC) $(CPPFLAGS) -MM $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o,"'
# find source path # find source path
source_path="$(dirname "$0")" source_path="$(dirname "$0")"
...@@ -1487,8 +1488,9 @@ fi ...@@ -1487,8 +1488,9 @@ fi
test -n "$cc_type" && enable $cc_type || echolog "Unknown C compiler $cc" test -n "$cc_type" && enable $cc_type || echolog "Unknown C compiler $cc"
: ${dep_cc_default:=$cc}
: ${ld_default:=$cc} : ${ld_default:=$cc}
set_default as ld set_default as dep_cc ld
if test -n "$sysroot"; then if test -n "$sysroot"; then
case "$cc_type" in case "$cc_type" in
...@@ -2480,6 +2482,7 @@ echo "BUILD_ROOT=\"$PWD\"" >> config.mak ...@@ -2480,6 +2482,7 @@ echo "BUILD_ROOT=\"$PWD\"" >> config.mak
echo "CC=$cc" >> config.mak echo "CC=$cc" >> config.mak
echo "AS=$as" >> config.mak echo "AS=$as" >> config.mak
echo "LD=$ld" >> config.mak echo "LD=$ld" >> config.mak
echo "DEPCC=$dep_cc" >> config.mak
echo "YASM=$yasmexe" >> config.mak echo "YASM=$yasmexe" >> config.mak
echo "AR=$ar" >> config.mak echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak echo "RANLIB=$ranlib" >> config.mak
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment