diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-07-17 19:15:09 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-07-19 20:22:54 +0200 |
| commit | 1fc645451d1d32db120fae5bcefd4c6653ca4f41 (patch) | |
| tree | de8bfe64d3229dd92f1d9378bc5e40d1234d2f5b /lib/test_server/src/ts_erl_config.erl | |
| parent | c6266995b9e007af4b48db8de1ddbaa7ced912fe (diff) | |
| download | otp-1fc645451d1d32db120fae5bcefd4c6653ca4f41.tar.gz otp-1fc645451d1d32db120fae5bcefd4c6653ca4f41.tar.bz2 otp-1fc645451d1d32db120fae5bcefd4c6653ca4f41.zip | |
test_server: Remove VxWorks
Diffstat (limited to 'lib/test_server/src/ts_erl_config.erl')
| -rw-r--r-- | lib/test_server/src/ts_erl_config.erl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl index 45d88016a4..83f8362735 100644 --- a/lib/test_server/src/ts_erl_config.erl +++ b/lib/test_server/src/ts_erl_config.erl @@ -160,7 +160,6 @@ system_include(Root, Vars) -> SysDir = case ts_lib:var(os, Vars) of "Windows" ++ _T -> "sys/win32"; - "VxWorks" -> "sys.vxworks"; _ -> "sys/unix" end, " -I" ++ quote(filename:nativename(filename:join([Root, "erts", "emulator", SysDir]))). @@ -176,9 +175,6 @@ erl_interface(Vars,OsType) -> {installed, _Root} -> {filename:join(Dir, "lib"), filename:join(Dir, "src")}; - {srctree, _Root, _Target} when OsType =:= vxworks -> - {filename:join(Dir, "lib"), - filename:join([Dir, "src"])}; {srctree, _Root, Target} -> {filename:join([Dir, "obj", Target]), filename:join([Dir, "src", Target])} @@ -218,7 +214,7 @@ erl_interface(Vars,OsType) -> {unix,_} -> "-lpthread"; _ -> - "" % VxWorks + "" end, [{erl_interface_libpath, quote(filename:nativename(LibPath))}, {erl_interface_sock_libs, sock_libraries(OsType)}, @@ -318,16 +314,12 @@ get_var(Key, Vars) -> sock_libraries({win32, _}) -> "ws2_32.lib"; sock_libraries({unix, _}) -> - ""; % Included in general libraries if needed. -sock_libraries(vxworks) -> - "". + "". % Included in general libraries if needed. link_library(LibName,{win32, _}) -> LibName ++ ".lib"; link_library(LibName,{unix, _}) -> "lib" ++ LibName ++ ".a"; -link_library(LibName,vxworks) -> - "lib" ++ LibName ++ ".a"; link_library(_LibName,_Other) -> exit({link_library, not_supported}). |