diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-03-12 14:07:12 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-03-12 14:07:12 +0100 |
| commit | bec7094e6b238774997bcb12f308f7f5bfadf160 (patch) | |
| tree | 4a7bc1bdbe4093beafb0035c4c6d60ae5a9a0f34 /lib/test_server/src | |
| parent | 9bcc7fe4e2983827bfb1fcb09963a49dfaf9a2d6 (diff) | |
| parent | 5a43729e86657e75e716ee879c03689a185965da (diff) | |
| download | otp-bec7094e6b238774997bcb12f308f7f5bfadf160.tar.gz otp-bec7094e6b238774997bcb12f308f7f5bfadf160.tar.bz2 otp-bec7094e6b238774997bcb12f308f7f5bfadf160.zip | |
Merge branch 'fredrik/ic_make_ji/OTP-10876' into maint
* fredrik/ic_make_ji/OTP-10876:
String instead of atom, not_found handled by ts:make
Checking if jinterface is present
Diffstat (limited to 'lib/test_server/src')
| -rw-r--r-- | lib/test_server/src/ts_erl_config.erl | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl index 73abe86e11..a0fab4e2d2 100644 --- a/lib/test_server/src/ts_erl_config.erl +++ b/lib/test_server/src/ts_erl_config.erl @@ -32,7 +32,7 @@ variables(Base0, OsType) -> Base2 = get_app_vars(fun erl_interface/2, Base1, OsType), Base3 = get_app_vars(fun ic/2, Base2, OsType), Base4 = get_app_vars(fun jinterface/2, Base3, OsType), - Base5 = dl_vars(Base4, OsType), + Base5 = dl_vars(Base4, Base3, OsType), Base6 = emu_vars(Base5), Base7 = get_app_vars(fun ssl/2, Base6, OsType), Base8 = erts_lib(Base7, OsType), @@ -60,7 +60,7 @@ get_app_vars(AppFun, Vars, OsType) -> exit({unexpected_internal_error, Garbage}) end. -dl_vars(Vars, _) -> +dl_vars(Vars, Base3, OsType) -> ShlibRules0 = ".SUFFIXES:\n" ++ ".SUFFIXES: @dll@ @obj@ .c\n\n" ++ ".c@dll@:\n" ++ @@ -68,7 +68,23 @@ dl_vars(Vars, _) -> "\t@SHLIB_LD@ @CROSSLDFLAGS@ @SHLIB_LDFLAGS@ $(SHLIB_EXTRA_LDFLAGS) -o $@ $*@obj@ @SHLIB_LDLIBS@ $(SHLIB_EXTRA_LDLIBS)", ShlibRules = ts_lib:subst(ShlibRules0, Vars), - [{'SHLIB_RULES', ShlibRules}|Vars]. + case get_app_vars2(fun jinterface/2, Base3, OsType) of + {App, not_found} -> + [{'SHLIB_RULES', ShlibRules}, {App, "not_found"}|Vars]; + _ -> + [{'SHLIB_RULES', ShlibRules}|Vars] + end. +get_app_vars2(AppFun, Vars, OsType) -> + case catch AppFun(Vars,OsType) of + Res when is_list(Res) -> + {jinterface, ok}; + {cannot_find_app, App} -> + {App, not_found}; + {'EXIT', Reason} -> + exit(Reason); + Garbage -> + exit({unexpected_internal_error, Garbage}) + end. erts_lib_name(multi_threaded, {win32, V}) -> link_library("erts_MD" ++ case is_debug_build() of |