git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 44e4bb4cfb81024c8f5fd2e179e8a32c42756a2f Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Sun, 23 Jul 2017 16:52:43 -0700
   4 Subject: [PATCH] build: Pass --tag=CC explictly when using libtool
   5
   6 Do not depend solely on libtool heuristics which fail
   7 in OE case when building with external compiler and
   8 hardening flags
   9
  10 Upstream-Status: Pending
  11
  12 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  13 ---
  14  Makefile.in              | 4 ++--
  15  build-scripts/makedep.sh | 8 ++++----
  16  2 files changed, 6 insertions(+), 6 deletions(-)
  17
  18 diff --git a/Makefile.in b/Makefile.in
  19 index ab51035..743ce30 100644
  20 --- a/Makefile.in
  21 +++ b/Makefile.in
  22 @@ -72,10 +72,10 @@ depend:
  23  include $(depend)
  24
  25  $(objects)/$(TARGET): $(OBJECTS)
  26 -       $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
  27 +       $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
  28
  29  $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
  30 -       $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
  31 +       $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
  32
  33
  34  install: all install-bin install-hdrs install-lib install-data install-man
  35 diff --git a/build-scripts/makedep.sh b/build-scripts/makedep.sh
  36 index 3b3863b..dba28f2 100755
  37 --- a/build-scripts/makedep.sh
  38 +++ b/build-scripts/makedep.sh
  39 @@ -51,19 +51,19 @@ do  echo "Generating dependencies for $src"
  40      case $ext in
  41          c) cat >>${output}.new <<__EOF__
  42
  43 -       \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
  44 +       \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
  45
  46  __EOF__
  47          ;;
  48          cc) cat >>${output}.new <<__EOF__
  49
  50 -       \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
  51 +       \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
  52
  53  __EOF__
  54          ;;
  55          m) cat >>${output}.new <<__EOF__
  56
  57 -       \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
  58 +       \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
  59
  60  __EOF__
  61          ;;
  62 @@ -75,7 +75,7 @@ __EOF__
  63          ;;
  64          S) cat >>${output}.new <<__EOF__
  65
  66 -       \$(LIBTOOL)  --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
  67 +       \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src  -o \$@
  68
  69  __EOF__
  70          ;;
  71 --
  72 2.13.3
  73