Unverified Commit 47533b85 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #202687 from thiagokokada/remove-march-native

treewide: remove -march=native
parents 20193b6d 93c50a28
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ in

      substituteInPlace Makefile \
        --replace 'unknown' 'v${version}'

      export CFLAGS="-march=native"
    '';

    makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1";
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ stdenv.mkDerivation {

  buildInputs = [ opencv4 ];

  NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";
  NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";

  preInstall = ''
    mkdir -p $out/include/aruco
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ in
    nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems];
    buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco];

    NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";
    NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
    dontWrapQtApps = true;

    cmakeFlags = [
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ index ebdc552..3e37573 100644
 # Linux
 linux-g++*{
-    QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99
+    QMAKE_CFLAGS += -O3 -fopenmp -march=native -std=c99
+    QMAKE_CFLAGS += -O3 -fopenmp -std=c99
     QMAKE_CXXFLAGS += -fopenmp
     LIBS += -lgomp
 }