diff --git a/weld/toolchain/gcc/lang/c.mk b/weld/toolchain/gcc/lang/c.mk
new file mode 100644
index 0000000..94c07ac
--- /dev/null
+++ b/weld/toolchain/gcc/lang/c.mk
@@ -0,0 +1,12 @@
+# Copyright 2015 Andrew Gottemoller.
+#
+# This software is a copyrighted work licensed under the terms of the
+# Weld license.  Please consult the file "WELD_LICENSE" for
+# details.
+
+# This makefile defines settings for the c language
+
+
+compile_command := $(if $(gcc_opt_use_clang),clang,gcc)
+
+compiler_flag_list := -std=c99 $(compiler_flag_list)
diff --git a/weld/toolchain/gcc/lang/cpp.mk b/weld/toolchain/gcc/lang/cpp.mk
new file mode 100644
index 0000000..4a84a12
--- /dev/null
+++ b/weld/toolchain/gcc/lang/cpp.mk
@@ -0,0 +1,12 @@
+# Copyright 2015 Andrew Gottemoller.
+#
+# This software is a copyrighted work licensed under the terms of the
+# Weld license.  Please consult the file "WELD_LICENSE" for
+# details.
+
+# This makefile defines settings for the cpp language
+
+
+compile_command := $(if $(gcc_opt_use_clang),clang++,g++)
+
+compiler_flag_list := -std=c++11 $(compiler_flag_list)