Skip to content

Commit

Permalink
Merge branch 'mr/adjust_installation' into 'master'
Browse files Browse the repository at this point in the history
Adjust installation layout.

See merge request eng/toolchain/gnatcoll-core!163
  • Loading branch information
Nikokrock committed Dec 10, 2024
2 parents 484f140 + 29a7343 commit e346e3d
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions gprproject/gprbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,15 @@ def run(self, args: list[str], **kwargs) -> int:
"-f",
f"--prefix={final_prefix}",
f"--sources-subdir=include/{self.project_name}",
# This is required to ensure that we can force reinstallation
# on top of an existing installation (incremental build
# support.
f"--install-name={self.project_name}",
# --install-name change default value for lib subdir. Not
# passing it would create an additional subdir with the project
# name (i.e: lib/NAME/NAME.{relocatable|static}/libNAME.so
# instead of lib/NAME.{relocatable|static}/libNAME.so
"--lib-subdir=lib",
]
if self.gnatcov:
# In gnatcov mode, by default copy the gnatcov runtime in the same
Expand Down

0 comments on commit e346e3d

Please sign in to comment.