diff options
author | Björn-Egil Dahlberg <[email protected]> | 2013-07-15 17:30:33 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2013-07-15 17:30:33 +0200 |
commit | c6f452c340ad1749ce91c037a4820ea0feb0a644 (patch) | |
tree | 771d4ce8009e17c42c02b0f3504f3d845e51ce8c /erts/preloaded/Makefile | |
parent | 625748f78566ba8638f494fc09be4311672e473b (diff) | |
parent | c250cec28d4cd5dbe68abd8835730eaf81aba086 (diff) | |
download | otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.tar.gz otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.tar.bz2 otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.zip |
Merge branch 'egil/erts/aggregate-system-traceability/OTP-11196' into maint
* egil/erts/aggregate-system-traceability/OTP-11196:
Check for native code without loading module
Fix erlang:system_info(compile_info)
Fix system_information get_beam_name/0
Add beam dynamic libraries to system_information
Add system_information testsuite
Add system information aggregate
Refactor away ?line macro in code_SUITE
Fix tests for erts app-file
Add erts app-file
erts: Add cflags, ldflags and config.h into executable
Diffstat (limited to 'erts/preloaded/Makefile')
-rw-r--r-- | erts/preloaded/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/preloaded/Makefile b/erts/preloaded/Makefile index 4235a7fe57..31fdeb96c5 100644 --- a/erts/preloaded/Makefile +++ b/erts/preloaded/Makefile @@ -18,7 +18,6 @@ # include $(ERL_TOP)/make/target.mk - SUB_DIRECTORIES = src include $(ERL_TOP)/make/otp_subdir.mk |