Commits
Marcus Calhoun-Lopez authored 1c1a014e71a
36 36 | |
37 37 | configure.args-append \ |
38 38 | -Dtests=false \ |
39 39 | -Dbenchmarks=false |
40 40 | |
41 41 | # override @rpath in installed library's install name |
42 42 | post-destroot { |
43 43 | set libname ${prefix}/lib/lib${name}-1.0.0.dylib |
44 44 | system "install_name_tool -id ${libname} ${destroot}${libname}" |
45 45 | } |
46 + | |
47 + | # gobject-introspection uses g-ir-scanner, which uses $CC from env |
48 + | if {[variant_isset universal]} { |
49 + | foreach arch ${configure.universal_archs} { |
50 + | lappend merger_build_env(${arch}) CC='${configure.cc} -arch ${arch}' |
51 + | lappend merger_destroot_env(${arch}) CC='${configure.cc} -arch ${arch}' |
52 + | } |
53 + | } else { |
54 + | build.env-append CC="${configure.cc} ${configure.cc_archflags}" |
55 + | destroot.env-append CC="${configure.cc} ${configure.cc_archflags}" |
56 + | } |