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/epmd | |
| 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/epmd')
| -rw-r--r-- | erts/epmd/src/Makefile.in | 4 |
1 files changed, 4 insertions, 0 deletions
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@ |