Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -durN scripts/build/libc/glibc-eglibc.sh-common scripts/build/libc/glibc-eglibc.sh-common
- --- scripts/build/libc/glibc-eglibc.sh-common 2014-02-18 23:44:16.560044600 +0100
- +++ scripts/build/libc/glibc-eglibc.sh-common 2014-02-18 23:48:58.552110700 +0100
- @@ -472,6 +472,7 @@
- # use the 'install-headers' makefile target to install the
- # headers
- + MSYS2_ARG_CONV_EXCL="-DNLSPATH=;-DLOCALEDIR=;-DLOCALE_ALIAS_PATH=" \
- CT_DoExecLog ALL make ${JOBSFLAGS} \
- install_root="${install_root}" \
- install-bootstrap-headers=yes \
- @@ -523,6 +524,7 @@
- # there are a few object files needed to link shared libraries,
- # which we build and install by hand
- CT_DoExecLog ALL mkdir -p "${extraos_dir}"
- + MSYS2_ARG_CONV_EXCL="-DNLSPATH=;-DLOCALEDIR=;-DLOCALE_ALIAS_PATH=" \
- CT_DoExecLog ALL make ${JOBSFLAGS} \
- "${extra_make_args[@]}" \
- csu/subdir_lib
- diff -durN glibc-2.18.orig/Makerules glibc-2.18/Makerules
- --- glibc-2.18.orig/Makerules 2013-08-11 00:52:55.000000000 +0200
- +++ glibc-2.18/Makerules 2014-02-18 23:32:22.009354100 +0100
- @@ -108,6 +108,14 @@
- endif # avoid-generated
- endif # $(versioning) = yes
- +# Hack for building on MSYS2 but using native host (e.g. MinGW-w64) compilers.
- +uname_o := $(shell uname -o)
- +ifneq (, $(findstring Msys, $(uname_o)))
- +common-objpfxh = $(shell cd $(common-objpfx); pwd -W)/
- +else
- +common-objpfxh = $(common-objpfx)
- +endif
- +
- ifndef avoid-generated
- before-compile := $(common-objpfx)libc-abis.h $(before-compile)
- $(common-objpfx)libc-abis.h: $(common-objpfx)libc-abis.stamp; @:
- @@ -372,8 +380,8 @@
- ifneq (,$(objpfx))
- # Continuation lines here are dangerous because they introduce spaces!
- define sed-remove-objpfx
- --e 's@ $(subst .,\.,$(subst @,\@,$(common-objpfx)))@ $$(common-objpfx)@g' \
- --e 's@^$(subst .,\.,$(subst @,\@,$(common-objpfx)))@$$(common-objpfx)@g'
- +-e 's@ $(subst .,\.,$(subst @,\@,$(common-objpfxh)))@ $$(common-objpfx)@g' \
- +-e 's@^$(subst .,\.,$(subst @,\@,$(common-objpfxh)))@$$(common-objpfx)@g'
- endef
- endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement