Changeset 4588


Ignore:
Timestamp:
Sep 5, 2013 2:15:19 AM (11 years ago)
Author:
ming
Message:

Closed #1576: Add support for clang compiler. Configure-iphone will now try to use clang as the default

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/configure-iphone

    r4282 r4588  
    1919  echo "             SDK." 
    2020  echo "  ARCH       Optional flags to specify target architecture, e.g." 
    21   echo "                ARCH='-arch armv6'" 
     21  echo "             ARCH='-arch armv6'. Default is armv7." 
    2222  echo "" 
    2323  exit 0 
     
    7575 
    7676if test "${CC}" = ""; then 
    77   # Try to use llvm-gcc if available 
     77  # Try to use clang if available 
     78  ccpath="${DEVPATH}/../../../Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" 
     79  # Next, try to use llvm-gcc 
    7880  gccpath="${DEVPATH}/usr/bin/llvm-gcc" 
    79   if test -e ${gccpath}; then 
     81  if test -e ${ccpath}; then 
     82    export CC="${ccpath}"  
     83  elif test -e ${gccpath}; then 
    8084    export CC="${gccpath}" 
    81  
    82     if test "${ARCH}" = ""; then 
    83        export ARCH="-arch armv7" 
    84        echo "$F: ARCH is not specified, choosing ${ARCH}" 
    85     fi 
    8685  else 
    8786    for archpath in `ls -d ${SDKPATH}/usr/lib/gcc/arm-apple-darwin*`; do 
     
    103102    echo "$F error: unable to find gcc for ${IPHONESDK}. If you think you have the right gcc, set the full path in CC environment variable." 
    104103    exit 1 
     104fi 
     105 
     106if test "${ARCH}" = ""; then 
     107  export ARCH="-arch armv7" 
     108  echo "$F: ARCH is not specified, choosing ${ARCH}" 
    105109fi 
    106110 
  • pjproject/trunk/third_party/srtp/crypto/cipher/aes_icm.c

    r1730 r4588  
    284284 */ 
    285285   
    286 inline void 
     286static inline void 
    287287aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) { 
    288288  /* fill buffer with new keystream */ 
  • pjproject/trunk/third_party/srtp/crypto/math/datatypes.c

    r2660 r4588  
    125125} 
    126126 
    127 inline int 
     127static inline int 
    128128hex_char_to_nibble(uint8_t c) { 
    129129  switch(c) { 
Note: See TracChangeset for help on using the changeset viewer.