Commit b06cd24c authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'gitlab/merge-requests/250'

parents 663a42c5 d628abb8

projects/lucetc/Remove-march-native-from-COMMON_CFLAGS.patch

0 → 100644
+24 −0
Original line number Diff line number Diff line 
From ce82762aef3f8cdbdd340f39f95d2491f69a7da0 Mon Sep 17 00:00:00 2001

From: Nicolas Vigier <boklm@torproject.org>

Date: Mon, 29 Mar 2021 13:42:48 +0200

Subject: [PATCH] Remove -march=native from COMMON_CFLAGS



The -march=native flag is causing an error on some hardware. It can also

make the build non-reproducible when not building on the same hardware.

---

 lucet-builtins/Makefile | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/lucet-builtins/Makefile b/lucet-builtins/Makefile

index 6ddbcfd..de7e540 100644

--- a/lucet-builtins/Makefile

+++ b/lucet-builtins/Makefile

@@ -7,7 +7,7 @@ LIBBUILTINS_OBJS:=$(addprefix build/, \

 	strcmp.o \

 	strlen.o )

 

-COMMON_CFLAGS:= --std=gnu99 -Ofast -Wall -Werror -march=native -fPIC \

+COMMON_CFLAGS:= --std=gnu99 -Ofast -Wall -Werror -fPIC \

 	-I../lucet-runtime/include

 

 default: build/libbuiltins.so

projects/lucetc/build

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ replace-with = "vendored-sources" 
directory = "/var/tmp/build/lucetc/vendor"

EOF



patch -p1 < $rootdir/Remove-march-native-from-COMMON_CFLAGS.patch



make -j[% c("buildconf/num_procs") %] build

# XXX: Should not be needed, just the lucetc binary, see: taskcluster/scripts/misc/build-lucetc.sh

make install

projects/lucetc/config

+1 −0
Original line number Diff line number Diff line
@@ -31,3 +31,4 @@ input_files: 
  # the sources.

  - URL: https://people.torproject.org/~gk/mirrors/sources/lucetc-vendor.tar.bz2

    sha256sum: 12ba97fca12177e7ed5b5409fcfdbd31dc7db2e82282768d99dee5bcb1b1246a

  - filename: Remove-march-native-from-COMMON_CFLAGS.patch