From 7fdc3f2f145c0b2f4785b5efec522218d0080cf6 Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson Date: Wed, 7 Dec 2011 13:13:22 +0100 Subject: [wx] Avoid missing wx_object behaviour warning Copy wx_object to bootstrap compiler --- lib/wx/src/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'lib/wx/src') diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile index 46bc06271c..4e5971de03 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -18,7 +18,15 @@ # include ../vsn.mk -include ../config.mk +ifdef TERTIARY_BOOTSTRAP + VSN = $(WX_VSN) + INSIDE_ERLSRC = true + include $(ERL_TOP)/make/target.mk + include $(ERL_TOP)/make/$(TARGET)/otp.mk + RELSYSDIR = $(RELEASE_PATH)/lib/wx-$(VSN) +else # Normal build + include ../config.mk +endif ESRC = . EGEN = gen @@ -65,7 +73,11 @@ APPUP_SRC = $(APPUP_FILE).src APPUP_TARGET = $(EBIN)/$(APPUP_FILE) # Targets -debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) +ifdef TERTIARY_BOOTSTRAP + opt: $(EBIN)/wx_object.beam +else + debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) +endif clean: rm -f $(TARGET_FILES) -- cgit v1.2.3