     # save cmd to tmp
     tmp = @cmd
 
-    if @isCpp
-      @clangPlusPlusCmd = atom.config.get 'linter-clang.clangPlusPlusCommand'
-      @cmd = "#{@clangPlusPlusCmd} #{@cmd} -x c++ -std=c++11 -fcxx-exceptions"
-    else
-      @clangCmd = atom.config.get 'linter-clang.clangCommand'
-      @cmd = "#{@clangCmd} #{@cmd} -x c -std=c11 -fexceptions"
+    @clang = atom.config.get 'linter-clang.clangCommand'
+    if atom.inDevMode()
+      console.log 'clang-command: ' + @clang
+
+    @cmd = "#{@clang} #{@cmd} -x #{@language}"
 
     if @isCpp
       @cmd += ' ' + atom.config.get 'linter-clang.clangDefaultCppFlags'

    @editor = editor

    if editor.getGrammar().name == 'C++'
      @grammar = '+'
      @isCpp = true
    if editor.getGrammar().name == 'C'
      @isCpp = false
      @grammar = 'c'

    super(editor)



  # A string, list, tuple or callable that returns a string, list or tuple,
  # containing the command line (with arguments) used to lint.
  cmd: '-fsyntax-only -fno-caret-diagnostics -fexceptions'
  isCpp: false
  clang: null

  executablePath: null

