Commit e0e0e1e0 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Be more precise about munging compiler/stage1/inplace-pkg-config

We were removing ".$(ProjectPatchLevel)" from anywhere in the file.
However, it included absolute paths, so if you untar a source
tarball into its default directory name, e.g.
"6.11.$(ProjectPatchLevel)", then the sed would break the paths.
parent da6785e5
......@@ -463,7 +463,9 @@ $(compiler_stage3_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(inclu
# [fiddle-stage1-version] above.
ifneq "$(ProjectPatchLevel)" "0"
compiler/stage1/inplace-pkg-config-munged: compiler/stage1/inplace-pkg-config
sed "s#.$(ProjectPatchLevel)##" <$< >$@
sed -e 's/^\(version: .*\)\.$(ProjectPatchLevel)$$/\1/' \
-e 's/^\(hs-libraries: HSghc-.*\)\.$(ProjectPatchLevel)$$/\1/' \
< $< > $@
$(compiler_stage1_GHC_PKG) update --force $(compiler_stage1_GHC_PKG_OPTS) $@
$(compiler_stage1_v_LIB) : compiler/stage1/inplace-pkg-config-munged
Supports Markdown
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