diff options
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff')
| -rw-r--r-- | nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff b/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff index 5821a9c130b0..745bba5d518d 100644 --- a/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff +++ b/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff @@ -1,26 +1,25 @@ -diff -Naur higan_v105-source.old/higan/GNUmakefile higan_v105-source.new/higan/GNUmakefile ---- higan_v105-source.old/higan/GNUmakefile 2017-10-07 01:34:22.000000000 -0300 -+++ higan_v105-source.new/higan/GNUmakefile 2017-10-17 00:02:40.580957396 -0200 -@@ -26,7 +26,7 @@ - flags += -fopenmp - link += -fopenmp - ifeq ($(binary),application) -- flags += -march=native -+ flags += - link += -Wl,-export-dynamic - link += -lX11 -lXext - else ifeq ($(binary),library) -diff -Naur higan_v105-source.old/nall/GNUmakefile higan_v105-source.new/nall/GNUmakefile ---- higan_v105-source.old/nall/GNUmakefile 2017-09-23 18:34:22.000000000 -0300 -+++ higan_v105-source.new/nall/GNUmakefile 2017-10-17 00:03:33.568916550 -0200 -@@ -40,8 +40,8 @@ - objcflags := -x objective-c -std=c11 - cppflags := -x c++ -std=c++14 - objcppflags := -x objective-c++ -std=c++14 --flags := --link := -+flags := $(CXXFLAGS) -+link := $(LDFLAGS) +diff -Naur higan-110-old/higan/GNUmakefile higan-110-new/higan/GNUmakefile +--- higan-110-old/higan/GNUmakefile 2020-04-15 11:06:00.279935557 -0300 ++++ higan-110-new/higan/GNUmakefile 2020-04-15 11:08:32.982417291 -0300 +@@ -11,7 +11,7 @@ + include $(nall.path)/GNUmakefile - # compiler detection - ifeq ($(compiler),) + ifeq ($(platform),local) +- flags += -march=native ++ flags += + endif + + ifeq ($(platform),windows) +diff -Naur higan-110-old/nall/GNUmakefile higan-110-new/nall/GNUmakefile +--- higan-110-old/nall/GNUmakefile 2020-04-15 11:06:00.396935154 -0300 ++++ higan-110-new/nall/GNUmakefile 2020-04-15 11:10:37.738011488 -0300 +@@ -127,7 +127,8 @@ + + # linux settings + ifeq ($(platform),linux) +- options += -ldl ++ flags += $(CXXFLAGS) ++ options += $(LDFLAGS) -ldl + endif + + # bsd settings |