Date: Sun, 31 Mar 2013 09:01:04 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1224 - trunk/Mk Message-ID: <201303310901.r2V914qm078439@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Mar 31 09:01:04 2013 New Revision: 1224 Log: temporarily avoid picking up clang from ports PR: ports/177224 Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Mar 30 11:42:16 2013 (r1223) +++ trunk/Mk/bsd.gecko.mk Sun Mar 31 09:01:04 2013 (r1224) @@ -544,18 +544,15 @@ LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN .if ${MOZILLA_VER:R:R} >= 19 || ${MOZILLA:Mseamonkey*} -# prefer clang -. if ${CC} == "cc" && (exists(/usr/bin/clang) || \ - exists(${LOCALBASE}/bin/clang)) -CC= clang +# prefer base clang, for lang/clang{,-devel} see ports/177224 +. if ${CC} == "cc" && exists(/usr/bin/clang) +CC= /usr/bin/clang . endif -. if ${CXX} == "c++" && (exists(/usr/bin/clang++) || \ - exists(${LOCALBASE}/bin/clang++)) -CXX= clang++ +. if ${CXX} == "c++" && exists(/usr/bin/clang++) +CXX= /usr/bin/clang++ . endif -. if ${CPP} == "cpp" && (exists(/usr/bin/clang-cpp) || \ - exists(${LOCALBASE}/bin/clang-cpp)) -CPP= clang-cpp +. if ${CPP} == "cpp" && exists(/usr/bin/clang-cpp) +CPP= /usr/bin/clang-cpp . endif . if ${CC} != "cc" && ${CPP} == "cpp" CPP= ${CC} -E @@ -941,7 +938,7 @@ -e 's|mozilla/plugins|browser_plugins|g' \ ${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \ ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp -.if ${CXX} == "clang++" && ${OSVERSION} < 900506 +.if !empty(CXX:M*clang*) && ${OSVERSION} < 900506 @${GREP} -Flr -- '-mss' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -e 's/-mss/-mmmx &/' .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303310901.r2V914qm078439>