[Swift 2.2] Request to merge a build-script fix


(Dmitri Gribenko) #1

Hi Ted,

Under certain circumstances, when the OS X machine has the
`/usr/include` directory that contains stale headers (not from the
current Xcode installation), the build might fail. This patch works
around the issue by ensuring that LLVM CMake scripts don't try to look
in `/usr/include`.

https://github.com/apple/swift/pull/1175
https://github.com/apple/swift/commit/79fdc7831d2039b4c59954c8845df622d9360e9e

Dmitri

···

--
main(i,j){for(i=2;;i++){for(j=2;j<i;j++){if(!(i%j)){j=0;break;}}if
(j){printf("%d\n",i);}}} /*Dmitri Gribenko <gribozavr@gmail.com>*/


(Ted Kremenek) #2

Approved for swift-2.2.

Cherry-picked to https://github.com/apple/swift/commit/d16df7a62cbbdcd10dcd9ee9733cf2f6c050348c.

···

On Feb 2, 2016, at 5:58 PM, Dmitri Gribenko <gribozavr@gmail.com> wrote:

Hi Ted,

Under certain circumstances, when the OS X machine has the
`/usr/include` directory that contains stale headers (not from the
current Xcode installation), the build might fail. This patch works
around the issue by ensuring that LLVM CMake scripts don't try to look
in `/usr/include`.

https://github.com/apple/swift/pull/1175
https://github.com/apple/swift/commit/79fdc7831d2039b4c59954c8845df622d9360e9e

Dmitri

--
main(i,j){for(i=2;;i++){for(j=2;j<i;j++){if(!(i%j)){j=0;break;}}if
(j){printf("%d\n",i);}}} /*Dmitri Gribenko <gribozavr@gmail.com>*/