diff options
| author | Erlang/OTP <[email protected]> | 2010-09-13 17:57:06 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-09-13 17:57:06 +0200 |
| commit | 3a4919553479db898a0935d4342a4fb8fcec66ae (patch) | |
| tree | 74102d028d8db62babc65b493baf1378e60979ce /erts | |
| parent | 807a9ec710cdd78199ee1dc77ca151f428810e0b (diff) | |
| parent | e79a81fcffda8f1f8cb32e83daeaf2f6113bbee5 (diff) | |
| download | otp-3a4919553479db898a0935d4342a4fb8fcec66ae.tar.gz otp-3a4919553479db898a0935d4342a4fb8fcec66ae.tar.bz2 otp-3a4919553479db898a0935d4342a4fb8fcec66ae.zip | |
Merge branch 'egil/fix-ei-on-vxwork/OTP-8838' of ../egil_otp into dev
* 'egil/fix-ei-on-vxwork/OTP-8838' of ../egil_otp:
Fix ei to build on vxworks
Diffstat (limited to 'erts')
| -rwxr-xr-x | erts/autoconf/configure.vxworks | 2 | ||||
| -rw-r--r-- | erts/autoconf/vxworks/sed.general | 4 | ||||
| -rw-r--r-- | erts/epmd/src/Makefile.in | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/erts/autoconf/configure.vxworks b/erts/autoconf/configure.vxworks index 70d7bdbaf2..14fbf766dc 100755 --- a/erts/autoconf/configure.vxworks +++ b/erts/autoconf/configure.vxworks @@ -101,7 +101,6 @@ epmd_dir=${ERL_TOP}/erts/epmd/src os_mon_dir=${ERL_TOP}/lib/os_mon/c_src orber_dir=${ERL_TOP}/lib/orber/c_src ic_dir=${ERL_TOP}/lib/ic/c_src -asn1_dir=${ERL_TOP}/lib/asn1/c_src internal_tools_dir=${ERL_TOP} libdir=${ERL_TOP}/lib tsdir=$libdir/test_server/src @@ -122,7 +121,6 @@ CONFIG_FILES="${ERL_TOP}/erts/emulator/$host/Makefile $os_mon_dir/$host/Makefile $zlibdir/$host/Makefile $ic_dir/$host/Makefile - $asn1_dir/$host/Makefile $runtime_tools_dir/$host/Makefile $tools_dir/$host/Makefile $orber_dir/$host/Makefile" diff --git a/erts/autoconf/vxworks/sed.general b/erts/autoconf/vxworks/sed.general index f725a6f9ca..551458daf5 100644 --- a/erts/autoconf/vxworks/sed.general +++ b/erts/autoconf/vxworks/sed.general @@ -55,12 +55,16 @@ s|@ETHR_LIBS@|| s|@ETHR_LIB_NAME@|| s|@ETHR_DEFS@|| s|@ETHR_THR_LIB_BASE@|| +s|@ETHR_THR_LIB_BASE_DIR@|| s|@EMU_THR_DEFS@|| s|@EMU_THR_LIBS@|| s|@EMU_THR_LIB_NAME@|ethread| s|@ERTS_ENABLE_KERNEL_POLL@|no| +s|@ERTS_INTERNAL_X_LIBS@|| s|@cc_root@|/clearcase/otp/| # Define VxWorks even though cross-compiling. +s|@CROSS_COMPILING|yes| + s|@HCFLAGS@|-DVXWORKS| s|@HCLIBS@|| s|@ENABLE_ALLOC_TYPE_VARS@|| diff --git a/erts/epmd/src/Makefile.in b/erts/epmd/src/Makefile.in index 70a54fe46e..2f5296a5e8 100644 --- a/erts/epmd/src/Makefile.in +++ b/erts/epmd/src/Makefile.in @@ -58,8 +58,12 @@ ERTS_INCL = -I$(ERL_TOP)/erts/include \ ifeq ($(TARGET),win32) ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal_r$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ else +ifeq ($(findstring vxworks,$(TARGET)),vxworks) +ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ +else ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm endif +endif CC = @CC@ WFLAGS = @WFLAGS@ |