Project

General

Profile

Actions

Submit #2205

closed

[PATCH] Fixes in libexec/custom/cc

Added by juanfra684 almost 13 years ago. Updated about 12 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
-
Target version:
-
Start date:
Due date:
% Done:

0%

Estimated time:

Description

- Removed unnecessary code with the actual versions of clang.

- Removed the conditional code for cpp.
Authors: Sascha Wildner <>
Juan Francisco Cantero Hurtado <>
---
libexec/customcc/cc.sh | 28 ++-------------------------
1 files changed, 3 insertions(
), 25 deletions(-)

diff --git a/libexec/customcc/cc.sh b/libexec/customcc/cc.sh
index 8755ef6..ae537af 100644
--- a/libexec/customcc/cc.sh
+++ b/libexec/customcc/cc.sh
@ -3,31 +3,9 @
CDIR=$(dirname $0)
CNAME=$(basename $0)

# XXX clang needs some special handling
#
# it is called only for "cc" and "gcc" and even then it could have been
# run on c++ files
#
-if [ "${CCVER}" = "clang" ]; then
if [ "${CNAME}" = "cpp" ]; then
- exec ${CDIR}/../gcc41/cpp "$"
- elif [ "${CNAME}" = "c++" -o "${CNAME}" = "g++" ]; then
- exec ${CDIR}/../gcc41/c++ "$
"
- elif [ z $beenhere ]; then
export beenhere=1
- oldargs="$"
- export oldargs
- INCOPT="-nobuiltininc -nostdinc \
- -isysroot
@INCPREFIX@ \
- -isystem /usr/include \
- -isystem /usr/libdata/gcc41 \
- -isystem /usr/include/c++/4.1"
- elif [ "${CNAME}" = "cc" -o "${CNAME}" = "gcc" ]; then
- exec ${CDIR}/../gcc41/cc $oldargs
- fi
-elif [ "${CCVER}" = "clangsvn" ]; then
- if [ "${CNAME}" = "cpp" ]; then
- exec ${CDIR}/../gcc41/cpp "$
"
if [ "${CCVER}" = "clang" o "${CCVER}" = "clangsvn" ]; then
if [ "${CNAME}" = "g++" -o "${CNAME}" = "c++" -o "${CNAME}" = "cc1plus" ]; then
+ exec ${CDIR}/../gcc44/g++ "$"
else
INCOPT="-nobuiltininc -nostdinc \
-isysroot
@INCPREFIX@@ \
-
Juan Francisco Cantero Hurtado http://juanfra.info

Actions #1

Updated by swildner about 12 years ago

  • Status changed from New to Closed

I pushed it in a slightly different way (d89cda310fac18bac18edce42fa346ac8f9c3e20).

Thanks!

Actions

Also available in: Atom PDF