diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-13 14:45:22 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-13 14:45:22 +0200 |
| commit | a2b75845814ec96323f0c403a17f5ae820163c06 (patch) | |
| tree | 5467247f26789d66a6bd07d17a6e49bc8f0144bc | |
| parent | 138b52c9beb0f0da71f66d2731ff45148448c932 (diff) | |
| parent | fb962f8965edb4fa53b98a0621b9db5538eef6e5 (diff) | |
| download | nx-libs-a2b75845814ec96323f0c403a17f5ae820163c06.tar.gz nx-libs-a2b75845814ec96323f0c403a17f5ae820163c06.tar.bz2 nx-libs-a2b75845814ec96323f0c403a17f5ae820163c06.zip | |
Merge branch 'sunweaver-pr/fix-ftbfs-on-linux-sparc64' into 3.6.x
Attributes GH PR #426: https://github.com/ArcticaProject/nx-libs/pull/426
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index d91dd371b..9a3e3ceb2 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -776,12 +776,13 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # endif # define LinuxMachineDefines -D__sparc__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define AsVISOption -Av9a # ifdef Sparc64Architecture # define AsOutputArchSize 64 +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # else # define AsOutputArchSize 32 +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # endif #endif |