[llvm-branch-commits] [cfe-branch] r71709 - in /cfe/branches/Apple/Dib: include/clang/Driver/Options.def lib/Driver/Tools.cpp

[Mike Stump]

Author: mrs
Date: Wed May 13 15:09:53 2009
New Revision: 71709

URL: http://llvm.org/viewvc/llvm-project?rev=71709&view=rev
Log:
Merge in 71698:

Driver: Emit an unsupported error on -iframework.

Modified:
    cfe/branches/Apple/Dib/include/clang/Driver/Options.def
    cfe/branches/Apple/Dib/lib/Driver/Tools.cpp

Modified: cfe/branches/Apple/Dib/include/clang/Driver/Options.def
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/include/clang/Driver/Options.def?rev=71709&r1=71708&r2=71709&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/include/clang/Driver/Options.def (original)
+++ cfe/branches/Apple/Dib/include/clang/Driver/Options.def Wed May 13 15:09:53 2009
@@ -462,6 +462,7 @@
 OPTION("-g", g_Joined, Joined, g_Group, INVALID, "", 0, 0, 0)
 OPTION("-headerpad_max_install_names", headerpad__max__install__names, Joined, INVALID, INVALID, "", 0, 0, 0)
 OPTION("-idirafter", idirafter, JoinedOrSeparate, clang_i_Group, INVALID, "", 0, 0, 0)
+OPTION("-iframework", iframework, JoinedOrSeparate, clang_i_Group, INVALID, "", 0, 0, 0)
 OPTION("-imacros", imacros, JoinedOrSeparate, clang_i_Group, INVALID, "", 0, 0, 0)
 OPTION("-image_base", image__base, Separate, INVALID, INVALID, "", 0, 0, 0)
 OPTION("-include", include, JoinedOrSeparate, clang_i_Group, INVALID, "", 0, 0, 0)

Modified: cfe/branches/Apple/Dib/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Driver/Tools.cpp?rev=71709&r1=71708&r2=71709&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Driver/Tools.cpp Wed May 13 15:09:53 2009
@@ -391,7 +391,8 @@
 
   Arg *Unsupported;
   if ((Unsupported = Args.getLastArg(options::OPT_MG)) ||
-      (Unsupported = Args.getLastArg(options::OPT_MQ)))
+      (Unsupported = Args.getLastArg(options::OPT_MQ)) ||
+      (Unsupported = Args.getLastArg(options::OPT_iframework)))
     D.Diag(clang::diag::err_drv_unsupported_opt)
       << Unsupported->getOption().getName();