diff options
| author | Erlang/OTP <[email protected]> | 2014-07-01 13:58:34 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-07-01 13:58:34 +0200 |
| commit | 2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8 (patch) | |
| tree | 56650b96db143ef382560a48a27e8f9669a80197 /erts/autoconf | |
| parent | 53f1678f15871505211ba574573247acc37ebb60 (diff) | |
| parent | fbb4d5a85baaeb0a946a00e5994fc1f4a12b2855 (diff) | |
| download | otp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.tar.gz otp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.tar.bz2 otp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.zip | |
Merge branch 'egil/fix-ethr-force-inline/OTP-12010' into maint-17
* egil/fix-ethr-force-inline/OTP-12010:
vxworks: Fix SYSTEMD_DAEMON_LIBS in configure
erts: Separate ethread inlining from ethread.h
Diffstat (limited to 'erts/autoconf')
| -rw-r--r-- | erts/autoconf/vxworks/sed.general | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/autoconf/vxworks/sed.general b/erts/autoconf/vxworks/sed.general index dbb9420b67..efa4e99054 100644 --- a/erts/autoconf/vxworks/sed.general +++ b/erts/autoconf/vxworks/sed.general @@ -57,6 +57,7 @@ s|@ETHR_LIB_NAME@|| s|@ETHR_DEFS@|| s|@ETHR_THR_LIB_BASE@|| s|@ETHR_THR_LIB_BASE_DIR@|| +s|@SYSTEMD_DAEMON_LIBS@|| s|@EMU_THR_DEFS@|| s|@EMU_THR_LIBS@|| s|@EMU_THR_LIB_NAME@|ethread| |