Commit 8933b4e3 authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

ghcilink001 is expected to fail when ghci is dynamic

dynamic ghci can't load .a files
parent 18760482
......@@ -55,7 +55,8 @@ if (ghc_with_threaded_rts == 1):
if (ghc_with_dynamic_rts == 1):
config.have_shared_libs = True
if (ghc_dynamic_by_default == 1):
config.ghc_dynamic_by_default = ghc_dynamic_by_default
if (ghc_dynamic_by_default):
config.run_ways.append('static')
else:
if (ghc_with_dynamic_rts == 1):
......
......@@ -356,6 +356,12 @@ def if_cygwin( f ):
# ---
def if_ghci_dynamic( f ):
if config.ghc_dynamic_by_default:
return f
else:
return normal
def if_in_tree_compiler( f ):
if config.in_tree_compiler:
return f
......
......@@ -81,9 +81,9 @@ RUNTEST_OPTS += -e ghc_unregisterised=0
endif
ifeq "$(GhcDynamicByDefault)" "YES"
RUNTEST_OPTS += -e ghc_dynamic_by_default=1
RUNTEST_OPTS += -e ghc_dynamic_by_default=True
else
RUNTEST_OPTS += -e ghc_dynamic_by_default=0
RUNTEST_OPTS += -e ghc_dynamic_by_default=False
endif
ifeq "$(GhcWithSMP)" "YES"
......
test('ghcilink001',
extra_clean(['dir001/*','dir001']),
[if_ghci_dynamic(expect_fail), # dynamic ghci can't load '.a's
extra_clean(['dir001/*','dir001'])],
run_command,
['$MAKE -s --no-print-directory ghcilink001'])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment