diff options
| author | Lukas Larsson <[email protected]> | 2012-06-01 10:53:11 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-01 10:53:11 +0200 |
| commit | b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6 (patch) | |
| tree | 8407030ca1c7b7649a21030c36275193d066e36c /erts/test/utils/gccifier.c | |
| parent | 3e348c69b6921dd0e2c5b699ccd36d46321c953c (diff) | |
| parent | 50da1658240587622a057afe2db13d7ebcea3813 (diff) | |
| download | otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.tar.gz otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.tar.bz2 otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.zip | |
Merge branch 'lukas/test-cases' into maint
* lukas/test-cases:
Ignore calls to wx* modules if it is undefined
Fix erl_interface testcases
Update gccifier to respect -link option
Extand timetrap for escript tests
Fix compilation issues on windows and Ubuntu 12.04
Ignore common_test bootstrap
Diffstat (limited to 'erts/test/utils/gccifier.c')
| -rw-r--r-- | erts/test/utils/gccifier.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/test/utils/gccifier.c b/erts/test/utils/gccifier.c index 64de764260..a6b8a340a1 100644 --- a/erts/test/utils/gccifier.c +++ b/erts/test/utils/gccifier.c @@ -231,6 +231,9 @@ main(int argc, char *argv[]) CHECK_FIRST_LINK_ARG; save_arg(&link_args, "-libpath:", arg, NULL); } + else if (strcmp("-link",arg) == 0) { + CHECK_FIRST_LINK_ARG; + } #endif /* #ifdef __WIN32__ */ else if (is_prefix("-l", &arg)) { CHECK_FIRST_LINK_ARG; |