diff options
| author | Lukas Larsson <[email protected]> | 2019-04-18 14:24:31 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-04-18 14:24:31 +0200 |
| commit | 659ed4c005bb8c943c217d52383c219c0998aafa (patch) | |
| tree | 1a92dbdc38bd517027c1f3e08edfea9afdcdd423 /erts/autoconf/vxworks/sed.general | |
| parent | d0482d868f4662ebebeb115878ea1f99da69f062 (diff) | |
| parent | bc39fa234dd2d2834985dcdd37159cbc9e4d8a51 (diff) | |
| download | otp-659ed4c005bb8c943c217d52383c219c0998aafa.tar.gz otp-659ed4c005bb8c943c217d52383c219c0998aafa.tar.bz2 otp-659ed4c005bb8c943c217d52383c219c0998aafa.zip | |
Merge branch 'lukas/OTP-22-rc2/misc-fixes/OTP-15773'
* lukas/OTP-22-rc2/misc-fixes/OTP-15773:
erts: Yield correctly when iterating over distr exit messages
erts: Fix cerl -rr to use correct etp file
erts: Fix etp-process-info to print exiting and free processes
tools: Adjust instrument abort tc to better trigger faults
erts: Fix cleanup of message factory undo
erts: Make dump_SUITE:free_dump not dump via rpc
erts: Add extra debugging to dist frag testcases
erts: Run smaller dist frag test to 32 bit machines
erl_docgen: Remove accidentally merged debug printout
erts: Fix z_SUITE to always look for cerl in ERL_TOP
otp: make top Makefile app target respect TYPE variable
vxworks: Make vxworks configure use environment CFLAGS
erts: Make erts_free debug failure easier to diagnose
erts: Fix gcc warning in to_erl
Diffstat (limited to 'erts/autoconf/vxworks/sed.general')
| -rw-r--r-- | erts/autoconf/vxworks/sed.general | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/autoconf/vxworks/sed.general b/erts/autoconf/vxworks/sed.general index d32fbdc5c0..ffd5a8133c 100644 --- a/erts/autoconf/vxworks/sed.general +++ b/erts/autoconf/vxworks/sed.general @@ -111,7 +111,7 @@ s|@erlexec@|erl.exec| s|@EMU_LIBOBJS@|| # General CFLAGS -s|@GENERAL_CFLAGS@|-DHAVE_LOCALTIME_R -DHAVE_GMTIME_R -DENABLE_ELIB_MALLOC -DELIB_HEAP_USER -DELIB_SORTED_BLOCKS -DWORDS_BIGENDIAN -DELIB_DONT_INITIALIZE -DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DSIZEOF_VOID_P=4 -DERTS_USE_PORT_TASKS=1|g +s|@GENERAL_CFLAGS@|@ENV_CFLAGS@ -DHAVE_LOCALTIME_R -DHAVE_GMTIME_R -DENABLE_ELIB_MALLOC -DELIB_HEAP_USER -DELIB_SORTED_BLOCKS -DWORDS_BIGENDIAN -DELIB_DONT_INITIALIZE -DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DSIZEOF_VOID_P=4 -DERTS_USE_PORT_TASKS=1|g s|@WFLAGS@|| # Thread flags for eidefs.mk (erl_interface) |