Skip to content
Snippets Groups Projects
Commit 4696b966 authored by Cheng Shao's avatar Cheng Shao Committed by Marge Bot
Browse files

hadrian: fix wasm backend post linker script permissions

The post-link.mjs script was incorrectly copied and installed as a
regular data file without executable permission, this commit fixes it.
parent 35b0ad90
No related branches found
No related tags found
No related merge requests found
......@@ -169,7 +169,7 @@ install_bin_direct:
install_lib: lib/settings
@echo "Copying libraries to $(DESTDIR)$(ActualLibsDir)"
$(INSTALL_DIR) "$(DESTDIR)$(ActualLibsDir)"
@dest="$(DESTDIR)$(ActualLibsDir)"; \
cd lib; \
for i in `$(FIND) . -type f`; do \
......@@ -185,6 +185,8 @@ install_lib: lib/settings
$(INSTALL_SHLIB) $$i "$$dest/`dirname $$i`" ;; \
*.dylib) \
$(INSTALL_SHLIB) $$i "$$dest/`dirname $$i`" ;; \
*.mjs) \
$(INSTALL_SCRIPT) $$i "$$dest/`dirname $$i`" ;; \
*) \
$(INSTALL_DATA) $$i "$$dest/`dirname $$i`" ;; \
esac; \
......
......@@ -211,7 +211,10 @@ copyRules = do
prefix -/- "ghc-interp.js" <~ return "."
prefix -/- "template-hsc.h" <~ return (pkgPath hsc2hs -/- "data")
prefix -/- "post-link.mjs" <~ pure "utils/jsffi"
prefix -/- "post-link.mjs" %> \file -> do
copyFile ("utils/jsffi" -/- makeRelative prefix file) file
makeExecutable file
prefix -/- "prelude.js" <~ pure "utils/jsffi"
prefix -/- "html/**" <~ return "utils/haddock/haddock-api/resources"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment