| From 44e4bb4cfb81024c8f5fd2e179e8a32c42756a2f Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Sun, 23 Jul 2017 16:52:43 -0700 |
| Subject: [PATCH] build: Pass --tag=CC explictly when using libtool |
| |
| Do not depend solely on libtool heuristics which fail |
| in OE case when building with external compiler and |
| hardening flags |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| Makefile.in | 4 ++-- |
| build-scripts/makedep.sh | 8 ++++---- |
| 2 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/Makefile.in b/Makefile.in |
| index ab51035..743ce30 100644 |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -72,10 +72,10 @@ depend: |
| include $(depend) |
| |
| $(objects)/$(TARGET): $(OBJECTS) |
| - $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| |
| $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
| - $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS) |
| + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS) |
| |
| |
| install: all install-bin install-hdrs install-lib install-data install-man |
| diff --git a/build-scripts/makedep.sh b/build-scripts/makedep.sh |
| index 3b3863b..dba28f2 100755 |
| --- a/build-scripts/makedep.sh |
| +++ b/build-scripts/makedep.sh |
| @@ -51,19 +51,19 @@ do echo "Generating dependencies for $src" |
| case $ext in |
| c) cat >>${output}.new <<__EOF__ |
| |
| - \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
| + \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
| |
| __EOF__ |
| ;; |
| cc) cat >>${output}.new <<__EOF__ |
| |
| - \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
| + \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
| |
| __EOF__ |
| ;; |
| m) cat >>${output}.new <<__EOF__ |
| |
| - \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
| + \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
| |
| __EOF__ |
| ;; |
| @@ -75,7 +75,7 @@ __EOF__ |
| ;; |
| S) cat >>${output}.new <<__EOF__ |
| |
| - \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
| + \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
| |
| __EOF__ |
| ;; |
| -- |
| 2.13.3 |
| |