diff options
author | Alp Toker <alp@nuanti.com> | 2014-02-24 12:29:14 +0000 |
---|---|---|
committer | Alp Toker <alp@nuanti.com> | 2014-02-24 12:29:14 +0000 |
commit | 9a0a20714fe3e0d48ad40c285cd93a46d32157ff (patch) | |
tree | 7d2d7970469b725a69aeb9cd17f9ee1d76d0283d /openmp/runtime/src | |
parent | c5df02fa0d9879041a41b0f56573c61ee651febd (diff) | |
download | bcm5719-llvm-9a0a20714fe3e0d48ad40c285cd93a46d32157ff.tar.gz bcm5719-llvm-9a0a20714fe3e0d48ad40c285cd93a46d32157ff.zip |
Fix linking and get the build working on OS X
No version of clang installed by XCode, ToT or otherwise recognizes the flag
'-no-intel-extensions' and more recent versions error out on it.
Prospectively conditionalize the flag behind "icc" to fix the mainline build
with clang.
llvm-svn: 202030
Diffstat (limited to 'openmp/runtime/src')
-rw-r--r-- | openmp/runtime/src/makefile.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openmp/runtime/src/makefile.mk b/openmp/runtime/src/makefile.mk index 8d3892a1180..fbed276b098 100644 --- a/openmp/runtime/src/makefile.mk +++ b/openmp/runtime/src/makefile.mk @@ -411,7 +411,9 @@ ifeq "$(os)" "lrb" endif ifeq "$(os)" "mac" - ld-flags += -no-intel-extensions + ifeq "$(c)" "icc" + ld-flags += -no-intel-extensions + endif ld-flags += -single_module ld-flags += -current_version $(VERSION).0 -compatibility_version $(VERSION).0 endif |