Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reinier Maas
GHC
Commits
2bc957b0
Commit
2bc957b0
authored
12 years ago
by
Simon Marlow
Browse files
Options
Downloads
Patches
Plain Diff
avoid the new -rtsopts/-shared warning
parent
e8461e6a
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
testsuite/tests/cabal/cabal04/Makefile
+4
-1
4 additions, 1 deletion
testsuite/tests/cabal/cabal04/Makefile
testsuite/tests/dynlibs/Makefile
+1
-1
1 addition, 1 deletion
testsuite/tests/dynlibs/Makefile
with
5 additions
and
2 deletions
testsuite/tests/cabal/cabal04/Makefile
+
4
−
1
View file @
2bc957b0
...
...
@@ -7,11 +7,14 @@ SETUP=./Setup -v0
# This tests that we can build a Cabal package that uses TH with both
# profiling and dynamic linking. (#3604)
# omitting -rtsopts from --ghc-options avoids a warning from GHC when
# building the shared library (-rtsopts has no effect with -shared)
cabal04
:
$(
MAKE
)
clean
'
$(
TEST_HC
)
'
-v0
--make
Setup
$(
SETUP
)
clean
$(
SETUP
)
configure
--with-ghc
=
'
$(
TEST_HC
)
'
--ghc-options
=
'
$(
TEST_HC_OPTS
)
'
$(
PROF
)
$(
DYN
)
$(
SETUP
)
configure
--with-ghc
=
'
$(
TEST_HC
)
'
--ghc-options
=
'
$(
filter-out -rtsopts,
$(
TEST_HC_OPTS
)
)
'
$(
PROF
)
$(
DYN
)
$(
SETUP
)
build 2> err
!
grep
-v
"Creating library file"
err
ifneq
"$(CLEANUP)" ""
...
...
This diff is collapsed.
Click to expand it.
testsuite/tests/dynlibs/Makefile
+
1
−
1
View file @
2bc957b0
...
...
@@ -9,7 +9,7 @@ T3807:
$(
RM
)
T3807-export.o T3807-load.o
$(
RM
)
T3807test.so
$(
RM
)
T3807-load
'
$(
TEST_HC
)
'
$(
filter-out
-rtsopts
,
$(
TEST_HC_OPTS
))
-v0
--make
-dynamic
-fPIC
-shared
T3807Export.hs T3807-export.c
-o
T3807test.so
-lHSrts-ghc
`
'
$(
TEST_HC
)
'
$(
TEST_HC_OPTS
)
--numeric-version
`
-rtsopts
'
$(
TEST_HC
)
'
$(
filter-out
-rtsopts
,
$(
TEST_HC_OPTS
))
-v0
--make
-dynamic
-fPIC
-shared
T3807Export.hs T3807-export.c
-o
T3807test.so
-lHSrts-ghc
`
'
$(
TEST_HC
)
'
$(
TEST_HC_OPTS
)
--numeric-version
`
'
$(
TEST_HC
)
'
$(
filter-out
-rtsopts
,
$(
TEST_HC_OPTS
))
-no-auto-link-packages
-no-hs-main
T3807-load.c
-o
T3807-load
-ldl
./T3807-load
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment