diff --git a/cc/cc.go b/cc/cc.go
index 2278ec0..c4e1d0e 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -488,15 +488,6 @@
 		}...)
 	}
 
-	instructionSet := c.Properties.Instruction_set
-	instructionSetFlags, err := toolchain.InstructionSetFlags(instructionSet)
-	if err != nil {
-		ctx.ModuleErrorf("%s", err)
-	}
-
-	// TODO: debug
-	flags.CFlags = append(flags.CFlags, c.Properties.Release.Cflags...)
-
 	if !ctx.ContainsProperty("clang") {
 		if ctx.Host() {
 			flags.Clang = true
@@ -507,6 +498,18 @@
 		}
 	}
 
+	instructionSet := c.Properties.Instruction_set
+	instructionSetFlags, err := toolchain.InstructionSetFlags(instructionSet)
+	if flags.Clang {
+		instructionSetFlags, err = toolchain.ClangInstructionSetFlags(instructionSet)
+	}
+	if err != nil {
+		ctx.ModuleErrorf("%s", err)
+	}
+
+	// TODO: debug
+	flags.CFlags = append(flags.CFlags, c.Properties.Release.Cflags...)
+
 	if flags.Clang {
 		flags.CFlags = clangFilterUnknownCflags(flags.CFlags)
 		flags.CFlags = append(flags.CFlags, c.Properties.Clang_cflags...)