diff --git a/modules/gmake2/gmake2.lua b/modules/gmake2/gmake2.lua index e63669ab..86126df9 100644 --- a/modules/gmake2/gmake2.lua +++ b/modules/gmake2/gmake2.lua @@ -251,8 +251,6 @@ end if not first then - p.outln('else') - p.outln(' $(error "invalid configuration $(config)")') p.outln('endif') p.outln('') end diff --git a/modules/gmake2/tests/test_gmake2_file_rules.lua b/modules/gmake2/tests/test_gmake2_file_rules.lua index e27897bb..0e767bb3 100644 --- a/modules/gmake2/tests/test_gmake2_file_rules.lua +++ b/modules/gmake2/tests/test_gmake2_file_rules.lua @@ -157,8 +157,6 @@ $(OBJDIR)/hello.o: src/hello.c @echo $(notdir $<) $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -else - $(error "invalid configuration $(config)") endif ]] end @@ -194,8 +192,6 @@ obj/Release/hello.obj: hello.x $(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo" $(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj" -else - $(error "invalid configuration $(config)") endif ]] end @@ -227,8 +223,6 @@ obj/Release/hello.obj: hello.x hello.x.inc hello.x.inc2 $(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo" $(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj" -else - $(error "invalid configuration $(config)") endif ]] end @@ -261,8 +255,6 @@ obj/Release/hello.obj: hello.x $(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj" obj/Release/hello.other obj/Release/hello.another: obj/Release/hello.obj -else - $(error "invalid configuration $(config)") endif ]] end diff --git a/modules/gmake2/tests/test_gmake2_objects.lua b/modules/gmake2/tests/test_gmake2_objects.lua index 69189535..b17e9200 100644 --- a/modules/gmake2/tests/test_gmake2_objects.lua +++ b/modules/gmake2/tests/test_gmake2_objects.lua @@ -90,8 +90,6 @@ OBJECTS += $(OBJDIR)/hello_debug.o else ifeq ($(config),release) OBJECTS += $(OBJDIR)/hello_release.o -else - $(error "invalid configuration $(config)") endif ]] @@ -156,8 +154,6 @@ OBJECTS += $(OBJDIR)/hello111.o else ifeq ($(config),release) OBJECTS += $(OBJDIR)/hello1.o -else - $(error "invalid configuration $(config)") endif ]] @@ -190,8 +186,6 @@ CUSTOM += obj/Debug/hello.luac else ifeq ($(config),release) CUSTOM += obj/Release/hello.luac -else - $(error "invalid configuration $(config)") endif ]] end @@ -224,8 +218,6 @@ OBJECTS += obj/Debug/hello.obj else ifeq ($(config),release) OBJECTS += obj/Release/hello.obj -else - $(error "invalid configuration $(config)") endif ]] end @@ -259,8 +251,6 @@ OBJECTS += obj/Debug/hello.obj else ifeq ($(config),release) OBJECTS += obj/Release/hello.obj -else - $(error "invalid configuration $(config)") endif ]] end @@ -294,8 +284,6 @@ CUSTOM += obj/Debug/hello.obj else ifeq ($(config),release) CUSTOM += obj/Release/hello.obj -else - $(error "invalid configuration $(config)") endif ]] end @@ -319,8 +307,6 @@ OBJECTS := ifeq ($(config),release) OBJECTS += $(OBJDIR)/hello.o -else - $(error "invalid configuration $(config)") endif ]] @@ -340,8 +326,6 @@ OBJECTS := ifeq ($(config),release) OBJECTS += $(OBJDIR)/hello.o -else - $(error "invalid configuration $(config)") endif ]]