Changeset 110308


Ignore:
Timestamp:
Aug 29, 2013, 9:28:22 PM (6 years ago)
Author:
jeremyhu@…
Message:

cctools: Fix some possible build failures

Location:
trunk/dports/devel/cctools
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/cctools/Portfile

    r107781 r110308  
    2828depends_build           port:ld64
    2929
    30 patchfiles              cctools-829-lto.patch PR-37520.patch
     30patchfiles              cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch
    3131
    3232variant universal {}
     
    4141    supported_archs     ppc i386 x86_64
    4242
    43     patchfiles-delete   cctools-829-lto.patch PR-37520.patch
     43    patchfiles-delete   cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch
    4444    patchfiles-append   cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch PR-12475288.patch
    4545} else {
     
    123123        USE_DEPENDENCY_FILE=NO \
    124124        BUILD_DYLIBS=NO \
    125         CC="${configure.cc}" \
    126         CXX="${configure.cxx}" \
     125        CC="${configure.cc} ${configure.cflags}" \
     126        CXX="${configure.cxx} ${configure.cxxflags}" \
    127127        RC_ARCHS="[get_canonical_archs]" \
    128128        SDK="-I${prefix}/include"
     
    131131        build.args-append \
    132132            LTO=-DLTO_SUPPORT \
    133             RC_CFLAGS="[get_canonical_archflags] -I`llvm-config-mp-${llvm_version} --includedir`" \
     133            RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
    134134            LLVM_MC="llvm-mc-mp-${llvm_version}"
    135135    } else {
     
    153153        USE_DEPENDENCY_FILE=NO \
    154154        BUILD_DYLIBS=NO \
    155         CC="${configure.cc}" \
    156         CXX="${configure.cxx}" \
     155        CC="${configure.cc} ${configure.cflags}" \
     156        CXX="${configure.cxx} ${configure.cxxflags}" \
    157157        RC_ARCHS="[get_canonical_archs]" \
    158158        SDK="-I${prefix}/include"
Note: See TracChangeset for help on using the changeset viewer.