diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 03:24:22 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 03:24:22 +0000 |
| commit | ce0424b2e68538f0e0c1b882300541ceed0d27e3 (patch) | |
| tree | 55d80adcdcd70e60e180be3acb102a1be02f00b3 /community/gdc/folders.diff | |
| parent | 5a81550adad5ccde4ad6924cfee2b2ef96d02c98 (diff) | |
Wed Jan 1 03:20:52 UTC 2014
Diffstat (limited to 'community/gdc/folders.diff')
| -rw-r--r-- | community/gdc/folders.diff | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff index 05fc9991a..cf89e5d3d 100644 --- a/community/gdc/folders.diff +++ b/community/gdc/folders.diff @@ -1,33 +1,16 @@ -diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in -index 9570bf3..52addc0 100644 ---- a/gcc/d/Make-lang.in -+++ b/gcc/d/Make-lang.in -@@ -25,10 +25,10 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor - - # This should be configured - ifeq ($(host), $(target)) -- D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/d/$(version) -+ D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc/$(version) - gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/..$(D_include_dir) - else -- gcc_d_include_dir = $(libsubdir)/include/d -+ gcc_d_include_dir = $(libsubdir)/include/dlang/gdc - endif - - diff --git a/libphobos/configure.ac b/libphobos/configure.ac -index dfb8fec..0b88ff4 100644 +index 69dfc35..89b8136 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac -@@ -220,9 +220,9 @@ dnl (# Default case for install directory for include files.) and on +@@ -215,9 +215,9 @@ dnl (# Default case for install directory for include files.) and on # will have to modify gcc/configure.ac .. # For now, basic workaround for cross compilers .. - if test "${host}" != "${build}"; then + if test "${host}" != "${target}"; then - gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d -+ gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang/ ++ gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang else - gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} -+ gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver} ++ gdc_include_dir='${prefix}'/include/dlang/gcc fi AC_SUBST(gdc_include_dir) AC_ARG_WITH([cross-host], |