| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| 3 | --- pcre-8.32.orig/Makefile.am |
| 4 | +++ pcre-8.32/Makefile.am |
| 5 | @@ -197,8 +197,18 @@ bin_SCRIPTS = pcre-config |
| 6 | |
| 7 | +CC_FOR_BUILD = @CC_FOR_BUILD@ |
| 8 | +CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ |
| 9 | +CCLD_FOR_BUILD = @CCLD_FOR_BUILD@ |
| 10 | +LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ |
| 11 | + |
| 12 | if WITH_REBUILD_CHARTABLES |
| 13 | |
| 14 | noinst_PROGRAMS += dftables |
| 15 | dftables_SOURCES = dftables.c |
| 16 | +dftables_LINK = $(CCLD_FOR_BUILD) -o $@ |
| 17 | +dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD) |
| 18 | + |
| 19 | +dftables.o: $(srcdir)/dftables.c |
| 20 | + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c |
| 21 | |
| 22 | pcre_chartables.c: dftables$(EXEEXT) |
| 23 | ./dftables$(EXEEXT) $@ |
| 24 | --- pcre-8.32.orig/configure.ac |
| 25 | +++ pcre-8.32/configure.ac |
| 26 | @@ -72,6 +72,22 @@ then |
| 27 | fi |
| 28 | fi |
| 29 | |
| 30 | +if test x"$cross_compiling" = xyes; then |
| 31 | + CC_FOR_BUILD="${CC_FOR_BUILD-gcc}" |
| 32 | + CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}" |
| 33 | + CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}" |
| 34 | + LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}" |
| 35 | +else |
| 36 | + CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}" |
| 37 | + CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}" |
| 38 | + CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}" |
| 39 | + LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}" |
| 40 | +fi |
| 41 | +AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler]) |
| 42 | +AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend]) |
| 43 | +AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments]) |
| 44 | +AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments]) |
| 45 | + |
| 46 | # AC_PROG_CXX will return "g++" even if no c++ compiler is installed. |
| 47 | # Check for that case, and just disable c++ code if g++ doesn't run. |
| 48 | AC_LANG_PUSH(C++) |