aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2011-12-07 13:13:22 +0100
committerDan Gudmundsson <[email protected]>2011-12-09 14:53:03 +0100
commit7fdc3f2f145c0b2f4785b5efec522218d0080cf6 (patch)
treebe5593211df26cc9ca403322b1f69a000e5102c7 /lib/wx/src
parentebb2a4c2e9e01d59d8074bcda5c97f2c3b200d76 (diff)
downloadotp-7fdc3f2f145c0b2f4785b5efec522218d0080cf6.tar.gz
otp-7fdc3f2f145c0b2f4785b5efec522218d0080cf6.tar.bz2
otp-7fdc3f2f145c0b2f4785b5efec522218d0080cf6.zip
[wx] Avoid missing wx_object behaviour warning
Copy wx_object to bootstrap compiler
Diffstat (limited to 'lib/wx/src')
-rw-r--r--lib/wx/src/Makefile16
1 files changed, 14 insertions, 2 deletions
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)