Merge branch 'fix_ld_pie_error' into 'master'

[sb2] Don't pass -r using -Wl,-r See merge request mer-core/scratchbox2!35
sailfishos · Oct 28, 2020 · 395a762 · 395a762
2 parents 1e5ced4 + fc3eefe
commit 395a762
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scratchbox2/llbuild/Makefile.include b/scratchbox2/llbuild/Makefile.include
@@ -82,12 +82,12 @@ endif
 %.a::
 	$(MKOUTPUTDIR)
 	$(P)ARCHIVE
-	$(Q)$(CC) $(LDFLAGS) -Wl,-r -nostdlib -nodefaultlibs -nostartfiles -o $@ $^
+	$(Q)$(CC) $(LDFLAGS) -r -nostdlib -nodefaultlibs -nostartfiles -o $@ $^
 
 built-in.o:: %.o
 	$(MKOUTPUTDIR)
 	$(P)BUILTIN
-	$(Q)$(CC) -Wl,-r -nostdlib -nodefaultlibs -nostartfiles -o $@ $^
+	$(Q)$(CC) -r -nostdlib -nodefaultlibs -nostartfiles -o $@ $^
 
 %.o:: %.S
 	$(MKOUTPUTDIR)