Skip to content

Fix -fdebug-prefix-map when using flexlink#9925

Merged
dra27 merged 2 commits intoocaml:trunkfrom
dra27:fdebug-prefix-map-PR
Sep 21, 2020
Merged

Fix -fdebug-prefix-map when using flexlink#9925
dra27 merged 2 commits intoocaml:trunkfrom
dra27:fdebug-prefix-map-PR

Conversation

@dra27
Copy link
Copy Markdown
Member

@dra27 dra27 commented Sep 17, 2020

On Cygwin, the -fdebug-prefix-map option is available. However, this gets passed to flexlink when configured with --enable-shared. This at present works with Cygwin's flexdll package because downstream patched flexlink. I'm not totally convinced that flexlink should blindly pass all -f options on because of the MSVC implications, so I think this is better fixed correctly at the OCaml end.

This PR introduces a check in Ccomp to determine if Config.mkexe is in fact flexlink. If so, it prepends -link to cause flexlink to correctly pass the flag on.

@dra27 dra27 force-pushed the fdebug-prefix-map-PR branch from 2b202d8 to 4d97a5a Compare September 18, 2020 08:32
@dra27 dra27 mentioned this pull request Sep 18, 2020
Prepend the -fdebug-prefix-map= option with -link if the "linker" is in
fact flexlink.
@dra27 dra27 force-pushed the fdebug-prefix-map-PR branch from 4d97a5a to 2bc77ee Compare September 21, 2020 09:34
@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Sep 21, 2020

Simpler implementation - rather than testing whether the linker command looks like flexlink, this instead determines whether it should be flexlink.

Copy link
Copy Markdown
Contributor

@xavierleroy xavierleroy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@dra27 dra27 merged commit 507f40e into ocaml:trunk Sep 21, 2020
@dra27 dra27 deleted the fdebug-prefix-map-PR branch September 21, 2020 12:33
dra27 added a commit that referenced this pull request Sep 21, 2020
@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Sep 21, 2020

Oops - sorry, I didn't update Changes, but I've pushed that directly

dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Jul 28, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Aug 4, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Aug 4, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Aug 4, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Aug 4, 2024
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Jun 28, 2025
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Jun 28, 2025
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Jun 28, 2025
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
dra27 added a commit to dra27/ocaml that referenced this pull request Jun 28, 2025
Fix -fdebug-prefix-map when using flexlink

(cherry picked from commit 507f40e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants